Rename tryCreateModel

Netatwork-de · Jan 23, 2025 · 9b8bb26 · 9b8bb26
1 parent 8128d1c
commit 9b8bb26
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 22 deletions.
diff --git a/src/api/index.ts b/src/api/index.ts
@@ -80,7 +80,7 @@ export function odataType(rawOdataType: string, friendlyType?: string, typePrope
  * + `null`, `undefined` or instances of `modelClass` are returned as is.
  * + Anything else is converted into the model class using `modelClass.create`.
  */
-export function tryCreateModel<M, T extends ModelInstance<M> | null | undefined>(modelClass: M, rawOrInstance: T): T {
+export function createModel<M, T extends ModelInstance<M> | null | undefined>(modelClass: M, rawOrInstance: T): T {
   if (rawOrInstance === null || rawOrInstance === undefined || rawOrInstance instanceof (modelClass as unknown as Class<M>)) {
     return rawOrInstance;
   }

diff --git a/src/cli/shared.ts b/src/cli/shared.ts
@@ -139,7 +139,7 @@ export class EdmInfo {
     //   .sort(([p1,], [p2,]) => p1 < p2 ? -1 : 1)
     //   .map(([nsPath, imports]) => new ImportDirectiveInfo(nsPath, imports));
     this.importDirectives = [
-      new ImportDirectiveInfo('@netatwork/odata-edm-generator', ['Class', 'odataEndpoint', 'odataType', 'odataTypeKey', 'ODataRawType', 'tryCreateModel']),
+      new ImportDirectiveInfo('@netatwork/odata-edm-generator', ['Class', 'odataEndpoint', 'odataType', 'odataTypeKey', 'ODataRawType', 'createModel']),
       new ImportDirectiveInfo(
         relative(dirname(filePath), getEndpointsPath(configuration))
           .replace(/\\/g, '/')

diff --git a/src/cli/templates.ts b/src/cli/templates.ts
@@ -52,7 +52,7 @@ export class <%= it.name %><% if (it.baseType) { %> extends <%= it.baseType.name
 <%= indent %>public static create<T<%= it.name %> extends <%= it.name %> = <%= it.name %>>(this: Class<T<%= it.name %>>, raw: T<%= it.name %>): T<%= it.name %> {
 <%= indent.repeat(2) %>return new this(
 <% for(const p of it.propertyInfos) { -%>
-<%= indent.repeat(3) %><% if (typeof p.type === 'string') { %>raw.<%= p.name %><% } else { %>tryCreateModel(<%= p.type.name %>, raw.<%= p.name %>)<% } %>,
+<%= indent.repeat(3) %><% if (typeof p.type === 'string') { %>raw.<%= p.name %><% } else { %>createModel(<%= p.type.name %>, raw.<%= p.name %>)<% } %>,
 <% } -%>
 <%= indent.repeat(2) %>);
 <%= indent %>}
@@ -147,7 +147,7 @@ export<% if(isAbstract) { %> abstract<% } %> class <%= name %> extends <%= baseT
 <%= indent %>public static create<T<%= name %> extends <%= name %> = <%= name %>>(raw: T<%= name %>): T<%= name %> {
 <%= indent.repeat(2) %>return new this(
 <% for(const p of it.propertyInfos) { -%>
-<%= indent.repeat(3) %><% if (typeof p.type === 'string') { %>raw.<%= p.name %><% } else { %>tryCreateModel(<%= p.type.name %>, raw.<%= p.name %>)<% } %>,
+<%= indent.repeat(3) %><% if (typeof p.type === 'string') { %>raw.<%= p.name %><% } else { %>createModel(<%= p.type.name %>, raw.<%= p.name %>)<% } %>,
 <% } -%>
 <%= indent.repeat(2) %>) as T<%= name %>;
 <%= indent %>}

diff --git a/tests/data/double-quote/expected/entities/Company/Service.ts b/tests/data/double-quote/expected/entities/Company/Service.ts
@@ -8,7 +8,7 @@ import {
     odataType,
     odataTypeKey,
     ODataRawType,
-    tryCreateModel,
+    createModel,
 } from "@netatwork/odata-edm-generator";
 import {
     Endpoints,

diff --git a/tests/data/indentsize-2/expected/entities/Company/Service.ts b/tests/data/indentsize-2/expected/entities/Company/Service.ts
@@ -8,7 +8,7 @@ import {
   odataType,
   odataTypeKey,
   ODataRawType,
-  tryCreateModel,
+  createModel,
 } from '@netatwork/odata-edm-generator';
 import {
   Endpoints,

diff --git a/tests/data/indentsize-3-double-quote/expected/entities/Company/Service.ts b/tests/data/indentsize-3-double-quote/expected/entities/Company/Service.ts
@@ -8,7 +8,7 @@ import {
    odataType,
    odataTypeKey,
    ODataRawType,
-   tryCreateModel,
+   createModel,
 } from "@netatwork/odata-edm-generator";
 import {
    Endpoints,

diff --git a/tests/data/longer-namespace/expected/entities/Company/Service/SubService/SubSubService.ts b/tests/data/longer-namespace/expected/entities/Company/Service/SubService/SubSubService.ts
@@ -8,7 +8,7 @@ import {
     odataType,
     odataTypeKey,
     ODataRawType,
-    tryCreateModel,
+    createModel,
 } from '@netatwork/odata-edm-generator';
 import {
     Endpoints,

diff --git a/tests/data/metadata-with-endpoints/expected/entities/Company/Service.ts b/tests/data/metadata-with-endpoints/expected/entities/Company/Service.ts
@@ -8,7 +8,7 @@ import {
     odataType,
     odataTypeKey,
     ODataRawType,
-    tryCreateModel,
+    createModel,
 } from '@netatwork/odata-edm-generator';
 import {
     Endpoints,
@@ -61,7 +61,7 @@ export class Bazz {
         return new this(
             raw.Id,
             raw.BazzProp2,
-            tryCreateModel(Bar, raw.Bar),
+            createModel(Bar, raw.Bar),
             raw.BarId,
             raw.BazzProp1,
             raw.Cp,
@@ -106,7 +106,7 @@ export class DomainSetting {
             raw.DomainId,
             raw.CertificateCount,
             raw.UserCount,
-            tryCreateModel(Domain, raw.Domain),
+            createModel(Domain, raw.Domain),
             raw.DomainName,
         );
     }
@@ -154,7 +154,7 @@ export class ChildOne extends Base {
             raw.BaseProp11,
             raw.BaseProp14,
             raw.ChildProp11,
-            tryCreateModel(BaseCondition, raw.Condition),
+            createModel(BaseCondition, raw.Condition),
         );
     }
 
@@ -229,7 +229,7 @@ export class GrandChild extends ChildOne {
             raw.BaseProp11,
             raw.BaseProp14,
             raw.ChildProp11,
-            tryCreateModel(BaseCondition, raw.Condition),
+            createModel(BaseCondition, raw.Condition),
             raw.GrandChildProp11,
         );
     }
@@ -422,7 +422,7 @@ export class FizzCondition extends BaseCondition {
             raw.FC1P1,
             raw.BC1P2,
             raw.FC1P2,
-            tryCreateModel(BaseConfiguration, raw.FC1P3),
+            createModel(BaseConfiguration, raw.FC1P3),
         ) as TFizzCondition;
     }
 

diff --git a/tests/data/multiple-endpoints/expected/bar/entities/Company/BarService.ts b/tests/data/multiple-endpoints/expected/bar/entities/Company/BarService.ts
@@ -8,7 +8,7 @@ import {
   odataType,
   odataTypeKey,
   ODataRawType,
-  tryCreateModel,
+  createModel,
 } from '@netatwork/odata-edm-generator';
 import {
   Endpoints,

diff --git a/tests/data/multiple-endpoints/expected/foo/entities/Company/FooService.ts b/tests/data/multiple-endpoints/expected/foo/entities/Company/FooService.ts
@@ -8,7 +8,7 @@ import {
   odataType,
   odataTypeKey,
   ODataRawType,
-  tryCreateModel,
+  createModel,
 } from '@netatwork/odata-edm-generator';
 import {
   Endpoints,
@@ -40,7 +40,7 @@ export class Bazz {
     return new this(
       raw.Id,
       raw.BazzProp2,
-      tryCreateModel(Bar, raw.Bar),
+      createModel(Bar, raw.Bar),
       raw.BarId,
       raw.BazzProp1,
       raw.Cp,
@@ -114,7 +114,7 @@ export class ChildOne extends Base {
       raw.BaseProp11,
       raw.BaseProp14,
       raw.ChildProp11,
-      tryCreateModel(StandardCondition, raw.Condition),
+      createModel(StandardCondition, raw.Condition),
     );
   }
 
@@ -189,7 +189,7 @@ export class GrandChild extends ChildOne {
       raw.BaseProp11,
       raw.BaseProp14,
       raw.ChildProp11,
-      tryCreateModel(StandardCondition, raw.Condition),
+      createModel(StandardCondition, raw.Condition),
       raw.GrandChildProp11,
     );
   }
@@ -547,7 +547,7 @@ export class FizzCondition extends StandardCondition {
       raw.FC1P1,
       raw.BC1P2,
       raw.FC1P2,
-      tryCreateModel(BaseConfiguration, raw.FC1P3),
+      createModel(BaseConfiguration, raw.FC1P3),
     ) as TFizzCondition;
   }
 

diff --git a/tests/data/simple-single-class/expected/entities/Company/Service.ts b/tests/data/simple-single-class/expected/entities/Company/Service.ts
@@ -8,7 +8,7 @@ import {
     odataType,
     odataTypeKey,
     ODataRawType,
-    tryCreateModel,
+    createModel,
 } from '@netatwork/odata-edm-generator';
 import {
     Endpoints,

diff --git a/tests/templates.spec.ts b/tests/templates.spec.ts
@@ -149,7 +149,7 @@ import {
     odataType,
     odataTypeKey,
     ODataRawType,
-    tryCreateModel,
+    createModel,
 } from '@netatwork/odata-edm-generator';
 import {
     Endpoints,