@odata-effect/odata-effect-generator 0.6.8 → 0.6.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (58) hide show
  1. package/dist/cjs/Cli.js +30 -13
  2. package/dist/cjs/Cli.js.map +1 -1
  3. package/dist/cjs/generator/Generator.js +1 -1
  4. package/dist/cjs/generator/Generator.js.map +1 -1
  5. package/dist/cjs/generator/IndexGenerator.js +3 -1
  6. package/dist/cjs/generator/IndexGenerator.js.map +1 -1
  7. package/dist/cjs/generator/ModelsGenerator.js +7 -16
  8. package/dist/cjs/generator/ModelsGenerator.js.map +1 -1
  9. package/dist/cjs/generator/NavigationGenerator.js +3 -1
  10. package/dist/cjs/generator/NavigationGenerator.js.map +1 -1
  11. package/dist/cjs/generator/OperationsGenerator.js +69 -1
  12. package/dist/cjs/generator/OperationsGenerator.js.map +1 -1
  13. package/dist/cjs/generator/QueryModelsGenerator.js +3 -1
  14. package/dist/cjs/generator/QueryModelsGenerator.js.map +1 -1
  15. package/dist/cjs/generator/ServiceFnGenerator.js +1 -2
  16. package/dist/cjs/generator/ServiceFnGenerator.js.map +1 -1
  17. package/dist/cjs/model/GeneratorConfig.js.map +1 -1
  18. package/dist/dts/Cli.d.ts.map +1 -1
  19. package/dist/dts/generator/Generator.d.ts +1 -1
  20. package/dist/dts/generator/IndexGenerator.d.ts +2 -3
  21. package/dist/dts/generator/IndexGenerator.d.ts.map +1 -1
  22. package/dist/dts/generator/NavigationGenerator.d.ts +2 -3
  23. package/dist/dts/generator/NavigationGenerator.d.ts.map +1 -1
  24. package/dist/dts/generator/OperationsGenerator.d.ts +2 -3
  25. package/dist/dts/generator/OperationsGenerator.d.ts.map +1 -1
  26. package/dist/dts/generator/QueryModelsGenerator.d.ts +2 -3
  27. package/dist/dts/generator/QueryModelsGenerator.d.ts.map +1 -1
  28. package/dist/dts/generator/ServiceFnGenerator.d.ts +2 -3
  29. package/dist/dts/generator/ServiceFnGenerator.d.ts.map +1 -1
  30. package/dist/dts/model/GeneratorConfig.d.ts +1 -3
  31. package/dist/dts/model/GeneratorConfig.d.ts.map +1 -1
  32. package/dist/esm/Cli.js +30 -13
  33. package/dist/esm/Cli.js.map +1 -1
  34. package/dist/esm/generator/Generator.js +1 -1
  35. package/dist/esm/generator/Generator.js.map +1 -1
  36. package/dist/esm/generator/IndexGenerator.js +3 -1
  37. package/dist/esm/generator/IndexGenerator.js.map +1 -1
  38. package/dist/esm/generator/ModelsGenerator.js +7 -16
  39. package/dist/esm/generator/ModelsGenerator.js.map +1 -1
  40. package/dist/esm/generator/NavigationGenerator.js +3 -1
  41. package/dist/esm/generator/NavigationGenerator.js.map +1 -1
  42. package/dist/esm/generator/OperationsGenerator.js +69 -1
  43. package/dist/esm/generator/OperationsGenerator.js.map +1 -1
  44. package/dist/esm/generator/QueryModelsGenerator.js +3 -1
  45. package/dist/esm/generator/QueryModelsGenerator.js.map +1 -1
  46. package/dist/esm/generator/ServiceFnGenerator.js +1 -2
  47. package/dist/esm/generator/ServiceFnGenerator.js.map +1 -1
  48. package/dist/esm/model/GeneratorConfig.js.map +1 -1
  49. package/package.json +1 -1
  50. package/src/Cli.ts +41 -16
  51. package/src/generator/Generator.ts +2 -2
  52. package/src/generator/IndexGenerator.ts +3 -4
  53. package/src/generator/ModelsGenerator.ts +7 -17
  54. package/src/generator/NavigationGenerator.ts +3 -4
  55. package/src/generator/OperationsGenerator.ts +72 -4
  56. package/src/generator/QueryModelsGenerator.ts +3 -4
  57. package/src/generator/ServiceFnGenerator.ts +3 -5
  58. package/src/model/GeneratorConfig.ts +1 -3
@@ -1 +1 @@
1
- {"version":3,"file":"QueryModelsGenerator.js","names":["_NamingHelper","require","generateQueryModels","dataModel","options","esmExtensions","lines","queryPathTypes","collectQueryPathTypes","push","serviceName","Array","from","join","usedEntityNames","entitySet","entitySets","values","entityType","entityTypes","get","entityTypeFqName","name","length","formatRelativeImport","complexType","complexTypes","line","generateQueryInterface","generateQueryInstance","generateQueryFactory","exports","types","Set","addPropertyTypes","props","prop","add","typeMapping","queryPath","split","addNavPropertyTypes","navProps","navProp","isCollection","properties","navigationProperties","type","interfaceName","getQueryInterfaceName","odataName","basePathType","pathType","startsWith","replace","targetQName","getClassName","targetType","instanceName","getQueryInstanceName","allFields","i","pathClass","isLast","targetMatch","match","targetInstanceName","factoryName","getQueryFactoryName"],"sources":["../../../src/generator/QueryModelsGenerator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"QueryModelsGenerator.js","names":["_NamingHelper","require","generateQueryModels","dataModel","options","esmExtensions","lines","queryPathTypes","collectQueryPathTypes","push","serviceName","Array","from","join","usedEntityNames","entitySet","entitySets","values","entityType","entityTypes","get","entityTypeFqName","name","length","formatRelativeImport","complexType","complexTypes","line","generateQueryInterface","generateQueryInstance","generateQueryFactory","exports","types","Set","addPropertyTypes","props","prop","add","typeMapping","queryPath","split","addNavPropertyTypes","navProps","navProp","isCollection","properties","navigationProperties","type","interfaceName","getQueryInterfaceName","odataName","basePathType","pathType","startsWith","replace","targetQName","getClassName","targetType","instanceName","getQueryInstanceName","allFields","i","pathClass","isLast","targetMatch","match","targetInstanceName","factoryName","getQueryFactoryName"],"sources":["../../../src/generator/QueryModelsGenerator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
@@ -12,8 +12,7 @@ var _NamingHelper = require("./NamingHelper.js");
12
12
  * @category generation
13
13
  */
14
14
  const generateServiceFns = (dataModel, options) => {
15
- const esmExtensions = options?.esmExtensions ?? true;
16
- const content = generateServicesFile(dataModel, esmExtensions);
15
+ const content = generateServicesFile(dataModel, options.esmExtensions);
17
16
  return {
18
17
  servicesFile: {
19
18
  fileName: "Services.ts",
@@ -1 +1 @@
1
- {"version":3,"file":"ServiceFnGenerator.js","names":["_NamingHelper","require","generateServiceFns","dataModel","options","esmExtensions","content","generateServicesFile","servicesFile","fileName","exports","lines","isV4","version","crudImportPath","entitySets","entitySet","values","entityType","entityTypes","get","entityTypeFqName","push","serviceName","modelImports","name","keys","length","getIdTypeName","getEditableTypeName","i","isLast","formatRelativeImport","serviceClassName","getServiceClassName","entityName","editableName","hasKeys","generateIdToKeyFunction","join","idTypeName","keyProp","keyTsType","typeMapping","tsType","isBrandedType","startsWith","odataName","keyMapping","map","k"],"sources":["../../../src/generator/ServiceFnGenerator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"ServiceFnGenerator.js","names":["_NamingHelper","require","generateServiceFns","dataModel","options","content","generateServicesFile","esmExtensions","servicesFile","fileName","exports","lines","isV4","version","crudImportPath","entitySets","entitySet","values","entityType","entityTypes","get","entityTypeFqName","push","serviceName","modelImports","name","keys","length","getIdTypeName","getEditableTypeName","i","isLast","formatRelativeImport","serviceClassName","getServiceClassName","entityName","editableName","hasKeys","generateIdToKeyFunction","join","idTypeName","keyProp","keyTsType","typeMapping","tsType","isBrandedType","startsWith","odataName","keyMapping","map","k"],"sources":["../../../src/generator/ServiceFnGenerator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
@@ -1 +1 @@
1
- {"version":3,"file":"GeneratorConfig.js","names":["getPropertyOverride","overrides","typeName","typeKind","odataPropertyName","undefined","typeOverrides","entities","complexTypes","properties","exports","getTypeOverride","name","getOperationOverride","operationName","operations","getOperationParameterOverride","parameterName","opOverride","parameters"],"sources":["../../../src/model/GeneratorConfig.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA;;;;;AAqHA;;;;;;AAMO,MAAMA,mBAAmB,GAAGA,CACjCC,SAAsC,EACtCC,QAAgB,EAChBC,QAA8B,EAC9BC,iBAAyB,KACH;EACtB,IAAI,CAACH,SAAS,EAAE,OAAOI,SAAS;EAEhC;EACA,MAAMC,aAAa,GAAGH,QAAQ,KAAK,QAAQ,GACvCF,SAAS,CAACM,QAAQ,GAAGL,QAAQ,CAAC,GAC9BD,SAAS,CAACO,YAAY,GAAGN,QAAQ,CAAC;EAEtC,IAAII,aAAa,EAAEG,UAAU,GAAGL,iBAAiB,CAAC,EAAE;IAClD,OAAOE,aAAa,CAACG,UAAU,CAACL,iBAAiB,CAAC;EACpD;EAEA;EACA,IAAIH,SAAS,CAACQ,UAAU,GAAGL,iBAAiB,CAAC,EAAE;IAC7C,OAAOH,SAAS,CAACQ,UAAU,CAACL,iBAAiB,CAAC;EAChD;EAEA,OAAOC,SAAS;AAClB,CAAC;AAED;;;;;;AAAAK,OAAA,CAAAV,mBAAA,GAAAA,mBAAA;AAMO,MAAMW,eAAe,GAAGA,CAC7BV,SAAsC,EACtCC,QAAgB,EAChBC,QAA8B,KACR;EACtB,IAAI,CAACF,SAAS,EAAE,OAAOI,SAAS;EAEhC,MAAMC,aAAa,GAAGH,QAAQ,KAAK,QAAQ,GACvCF,SAAS,CAACM,QAAQ,GAAGL,QAAQ,CAAC,GAC9BD,SAAS,CAACO,YAAY,GAAGN,QAAQ,CAAC;EAEtC,OAAOI,aAAa,EAAEM,IAAI;AAC5B,CAAC;AAED;;;;;;AAAAF,OAAA,CAAAC,eAAA,GAAAA,eAAA;AAMO,MAAME,oBAAoB,GAAGA,CAClCZ,SAAsC,EACtCa,aAAqB,KACC;EACtB,IAAI,CAACb,SAAS,EAAE,OAAOI,SAAS;EAChC,OAAOJ,SAAS,CAACc,UAAU,GAAGD,aAAa,CAAC,EAAEF,IAAI;AACpD,CAAC;AAED;;;;;;AAAAF,OAAA,CAAAG,oBAAA,GAAAA,oBAAA;AAMO,MAAMG,6BAA6B,GAAGA,CAC3Cf,SAAsC,EACtCa,aAAqB,EACrBG,aAAqB,KACC;EACtB,IAAI,CAAChB,SAAS,EAAE,OAAOI,SAAS;EAEhC;EACA,MAAMa,UAAU,GAAGjB,SAAS,CAACc,UAAU,GAAGD,aAAa,CAAC,EAAEK,UAAU,GAAGF,aAAa,CAAC;EACrF,IAAIC,UAAU,EAAE,OAAOA,UAAU;EAEjC;EACA,OAAOjB,SAAS,CAACQ,UAAU,GAAGQ,aAAa,CAAC;AAC9C,CAAC;AAAAP,OAAA,CAAAM,6BAAA,GAAAA,6BAAA","ignoreList":[]}
1
+ {"version":3,"file":"GeneratorConfig.js","names":["getPropertyOverride","overrides","typeName","typeKind","odataPropertyName","undefined","typeOverrides","entities","complexTypes","properties","exports","getTypeOverride","name","getOperationOverride","operationName","operations","getOperationParameterOverride","parameterName","opOverride","parameters"],"sources":["../../../src/model/GeneratorConfig.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA;;;;;AAmHA;;;;;;AAMO,MAAMA,mBAAmB,GAAGA,CACjCC,SAAsC,EACtCC,QAAgB,EAChBC,QAA8B,EAC9BC,iBAAyB,KACH;EACtB,IAAI,CAACH,SAAS,EAAE,OAAOI,SAAS;EAEhC;EACA,MAAMC,aAAa,GAAGH,QAAQ,KAAK,QAAQ,GACvCF,SAAS,CAACM,QAAQ,GAAGL,QAAQ,CAAC,GAC9BD,SAAS,CAACO,YAAY,GAAGN,QAAQ,CAAC;EAEtC,IAAII,aAAa,EAAEG,UAAU,GAAGL,iBAAiB,CAAC,EAAE;IAClD,OAAOE,aAAa,CAACG,UAAU,CAACL,iBAAiB,CAAC;EACpD;EAEA;EACA,IAAIH,SAAS,CAACQ,UAAU,GAAGL,iBAAiB,CAAC,EAAE;IAC7C,OAAOH,SAAS,CAACQ,UAAU,CAACL,iBAAiB,CAAC;EAChD;EAEA,OAAOC,SAAS;AAClB,CAAC;AAED;;;;;;AAAAK,OAAA,CAAAV,mBAAA,GAAAA,mBAAA;AAMO,MAAMW,eAAe,GAAGA,CAC7BV,SAAsC,EACtCC,QAAgB,EAChBC,QAA8B,KACR;EACtB,IAAI,CAACF,SAAS,EAAE,OAAOI,SAAS;EAEhC,MAAMC,aAAa,GAAGH,QAAQ,KAAK,QAAQ,GACvCF,SAAS,CAACM,QAAQ,GAAGL,QAAQ,CAAC,GAC9BD,SAAS,CAACO,YAAY,GAAGN,QAAQ,CAAC;EAEtC,OAAOI,aAAa,EAAEM,IAAI;AAC5B,CAAC;AAED;;;;;;AAAAF,OAAA,CAAAC,eAAA,GAAAA,eAAA;AAMO,MAAME,oBAAoB,GAAGA,CAClCZ,SAAsC,EACtCa,aAAqB,KACC;EACtB,IAAI,CAACb,SAAS,EAAE,OAAOI,SAAS;EAChC,OAAOJ,SAAS,CAACc,UAAU,GAAGD,aAAa,CAAC,EAAEF,IAAI;AACpD,CAAC;AAED;;;;;;AAAAF,OAAA,CAAAG,oBAAA,GAAAA,oBAAA;AAMO,MAAMG,6BAA6B,GAAGA,CAC3Cf,SAAsC,EACtCa,aAAqB,EACrBG,aAAqB,KACC;EACtB,IAAI,CAAChB,SAAS,EAAE,OAAOI,SAAS;EAEhC;EACA,MAAMa,UAAU,GAAGjB,SAAS,CAACc,UAAU,GAAGD,aAAa,CAAC,EAAEK,UAAU,GAAGF,aAAa,CAAC;EACrF,IAAIC,UAAU,EAAE,OAAOA,UAAU;EAEjC;EACA,OAAOjB,SAAS,CAACQ,UAAU,GAAGQ,aAAa,CAAC;AAC9C,CAAC;AAAAP,OAAA,CAAAM,6BAAA,GAAAA,6BAAA","ignoreList":[]}
@@ -1 +1 @@
1
- {"version":3,"file":"Cli.d.ts","sourceRoot":"","sources":["../../src/Cli.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAqIvC;;;;;GAKG;AACH,eAAO,MAAM,GAAG,sKAGd,CAAA"}
1
+ {"version":3,"file":"Cli.d.ts","sourceRoot":"","sources":["../../src/Cli.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AA8JvC;;;;;GAKG;AACH,eAAO,MAAM,GAAG,sKAGd,CAAA"}
@@ -27,7 +27,7 @@ export interface GeneratorConfig {
27
27
  /**
28
28
  * Add .js extensions to relative imports for ESM compatibility.
29
29
  * Required for moduleResolution: node16/nodenext.
30
- * @default true
30
+ * @default false
31
31
  */
32
32
  readonly esmExtensions?: boolean | undefined;
33
33
  }
@@ -13,9 +13,8 @@ import type { DataModel } from "../model/DataModel.js";
13
13
  export interface IndexGeneratorOptions {
14
14
  /**
15
15
  * Add .js extensions to relative imports for ESM compatibility.
16
- * @default true
17
16
  */
18
- readonly esmExtensions?: boolean;
17
+ readonly esmExtensions: boolean;
19
18
  }
20
19
  /**
21
20
  * Generate the index.ts file content.
@@ -23,5 +22,5 @@ export interface IndexGeneratorOptions {
23
22
  * @since 1.0.0
24
23
  * @category generation
25
24
  */
26
- export declare const generateIndex: (dataModel: DataModel, options?: IndexGeneratorOptions) => string;
25
+ export declare const generateIndex: (dataModel: DataModel, options: IndexGeneratorOptions) => string;
27
26
  //# sourceMappingURL=IndexGenerator.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"IndexGenerator.d.ts","sourceRoot":"","sources":["../../../src/generator/IndexGenerator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAatD;;;;;GAKG;AACH,MAAM,WAAW,qBAAqB;IACpC;;;OAGG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CACjC;AAED;;;;;GAKG;AACH,eAAO,MAAM,aAAa,GACxB,WAAW,SAAS,EACpB,UAAU,qBAAqB,KAC9B,MAqHF,CAAA"}
1
+ {"version":3,"file":"IndexGenerator.d.ts","sourceRoot":"","sources":["../../../src/generator/IndexGenerator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAatD;;;;;GAKG;AACH,MAAM,WAAW,qBAAqB;IACpC;;OAEG;IACH,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAA;CAChC;AAED;;;;;GAKG;AACH,eAAO,MAAM,aAAa,GACxB,WAAW,SAAS,EACpB,SAAS,qBAAqB,KAC7B,MAqHF,CAAA"}
@@ -54,9 +54,8 @@ export interface NavigationGenerationResult {
54
54
  export interface NavigationGeneratorOptions {
55
55
  /**
56
56
  * Add .js extensions to relative imports for ESM compatibility.
57
- * @default true
58
57
  */
59
- readonly esmExtensions?: boolean;
58
+ readonly esmExtensions: boolean;
60
59
  }
61
60
  /**
62
61
  * Generate navigation builders.
@@ -64,5 +63,5 @@ export interface NavigationGeneratorOptions {
64
63
  * @since 1.0.0
65
64
  * @category generation
66
65
  */
67
- export declare const generateNavigations: (dataModel: DataModel, options?: NavigationGeneratorOptions) => NavigationGenerationResult;
66
+ export declare const generateNavigations: (dataModel: DataModel, options: NavigationGeneratorOptions) => NavigationGenerationResult;
68
67
  //# sourceMappingURL=NavigationGenerator.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"NavigationGenerator.d.ts","sourceRoot":"","sources":["../../../src/generator/NavigationGenerator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,OAAO,KAAK,EAAE,SAAS,EAAmB,MAAM,uBAAuB,CAAA;AAiCvE;;GAEG;AACH,eAAO,MAAM,yBAAyB,QAAO,MAAwB,CAAA;AAErE;;;;;GAKG;AACH,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CACzB;AAED;;;;;GAKG;AACH,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,eAAe,EAAE,aAAa,CAAC,uBAAuB,CAAC,CAAA;CACjE;AA8FD;;;;;GAKG;AACH,MAAM,WAAW,0BAA0B;IACzC;;;OAGG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CACjC;AAED;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,GAC9B,WAAW,SAAS,EACpB,UAAU,0BAA0B,KACnC,0BAWF,CAAA"}
1
+ {"version":3,"file":"NavigationGenerator.d.ts","sourceRoot":"","sources":["../../../src/generator/NavigationGenerator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,OAAO,KAAK,EAAE,SAAS,EAAmB,MAAM,uBAAuB,CAAA;AAiCvE;;GAEG;AACH,eAAO,MAAM,yBAAyB,QAAO,MAAwB,CAAA;AAErE;;;;;GAKG;AACH,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CACzB;AAED;;;;;GAKG;AACH,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,eAAe,EAAE,aAAa,CAAC,uBAAuB,CAAC,CAAA;CACjE;AA8FD;;;;;GAKG;AACH,MAAM,WAAW,0BAA0B;IACzC;;OAEG;IACH,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAA;CAChC;AAED;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,GAC9B,WAAW,SAAS,EACpB,SAAS,0BAA0B,KAClC,0BAWF,CAAA"}
@@ -50,9 +50,8 @@ export interface OperationsGenerationResult {
50
50
  export interface OperationsGeneratorOptions {
51
51
  /**
52
52
  * Add .js extensions to relative imports for ESM compatibility.
53
- * @default true
54
53
  */
55
- readonly esmExtensions?: boolean;
54
+ readonly esmExtensions: boolean;
56
55
  }
57
56
  /**
58
57
  * Generate the operations file.
@@ -60,5 +59,5 @@ export interface OperationsGeneratorOptions {
60
59
  * @since 1.0.0
61
60
  * @category generation
62
61
  */
63
- export declare const generateOperations: (dataModel: DataModel, options?: OperationsGeneratorOptions) => OperationsGenerationResult;
62
+ export declare const generateOperations: (dataModel: DataModel, options: OperationsGeneratorOptions) => OperationsGenerationResult;
64
63
  //# sourceMappingURL=OperationsGenerator.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"OperationsGenerator.d.ts","sourceRoot":"","sources":["../../../src/generator/OperationsGenerator.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAA2B,MAAM,uBAAuB,CAAA;AA2B/F;;;;;;GAMG;AACH,eAAO,MAAM,wBAAwB,GAAI,WAAW,cAAc,KAAG,MAEpE,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,QAAO,MAAsB,CAAA;AAEjE;;;;;GAKG;AACH,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CACzB;AAED;;;;;GAKG;AACH,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,cAAc,EAAE,uBAAuB,GAAG,IAAI,CAAA;CACxD;AAED;;;;;GAKG;AACH,MAAM,WAAW,0BAA0B;IACzC;;;OAGG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CACjC;AAED;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAC7B,WAAW,SAAS,EACpB,UAAU,0BAA0B,KACnC,0BAkBF,CAAA"}
1
+ {"version":3,"file":"OperationsGenerator.d.ts","sourceRoot":"","sources":["../../../src/generator/OperationsGenerator.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAA2B,MAAM,uBAAuB,CAAA;AA2B/F;;;;;;GAMG;AACH,eAAO,MAAM,wBAAwB,GAAI,WAAW,cAAc,KAAG,MAEpE,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,QAAO,MAAsB,CAAA;AAEjE;;;;;GAKG;AACH,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CACzB;AAED;;;;;GAKG;AACH,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,cAAc,EAAE,uBAAuB,GAAG,IAAI,CAAA;CACxD;AAED;;;;;GAKG;AACH,MAAM,WAAW,0BAA0B;IACzC;;OAEG;IACH,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAA;CAChC;AAED;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAC7B,WAAW,SAAS,EACpB,SAAS,0BAA0B,KAClC,0BAkBF,CAAA"}
@@ -13,9 +13,8 @@ import type { DataModel } from "../model/DataModel.js";
13
13
  export interface QueryModelsGeneratorOptions {
14
14
  /**
15
15
  * Add .js extensions to relative imports for ESM compatibility.
16
- * @default true
17
16
  */
18
- readonly esmExtensions?: boolean;
17
+ readonly esmExtensions: boolean;
19
18
  }
20
19
  /**
21
20
  * Generate the QueryModels.ts file content.
@@ -23,5 +22,5 @@ export interface QueryModelsGeneratorOptions {
23
22
  * @since 1.0.0
24
23
  * @category generation
25
24
  */
26
- export declare const generateQueryModels: (dataModel: DataModel, options?: QueryModelsGeneratorOptions) => string;
25
+ export declare const generateQueryModels: (dataModel: DataModel, options: QueryModelsGeneratorOptions) => string;
27
26
  //# sourceMappingURL=QueryModelsGenerator.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"QueryModelsGenerator.d.ts","sourceRoot":"","sources":["../../../src/generator/QueryModelsGenerator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,EAEV,SAAS,EAIV,MAAM,uBAAuB,CAAA;AAS9B;;;;;GAKG;AACH,MAAM,WAAW,2BAA2B;IAC1C;;;OAGG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CACjC;AAED;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,GAC9B,WAAW,SAAS,EACpB,UAAU,2BAA2B,KACpC,MA6DF,CAAA"}
1
+ {"version":3,"file":"QueryModelsGenerator.d.ts","sourceRoot":"","sources":["../../../src/generator/QueryModelsGenerator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,EAEV,SAAS,EAIV,MAAM,uBAAuB,CAAA;AAS9B;;;;;GAKG;AACH,MAAM,WAAW,2BAA2B;IAC1C;;OAEG;IACH,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAA;CAChC;AAED;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,GAC9B,WAAW,SAAS,EACpB,SAAS,2BAA2B,KACnC,MA6DF,CAAA"}
@@ -35,9 +35,8 @@ export interface ServiceGenerationResult {
35
35
  export interface ServiceGeneratorOptions {
36
36
  /**
37
37
  * Add .js extensions to relative imports for ESM compatibility.
38
- * @default true
39
38
  */
40
- readonly esmExtensions?: boolean;
39
+ readonly esmExtensions: boolean;
41
40
  }
42
41
  /**
43
42
  * Generate the Services.ts file using crud factory.
@@ -45,5 +44,5 @@ export interface ServiceGeneratorOptions {
45
44
  * @since 1.0.0
46
45
  * @category generation
47
46
  */
48
- export declare const generateServiceFns: (dataModel: DataModel, options?: ServiceGeneratorOptions) => ServiceGenerationResult;
47
+ export declare const generateServiceFns: (dataModel: DataModel, options: ServiceGeneratorOptions) => ServiceGenerationResult;
49
48
  //# sourceMappingURL=ServiceFnGenerator.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"ServiceFnGenerator.d.ts","sourceRoot":"","sources":["../../../src/generator/ServiceFnGenerator.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,SAAS,EAAmC,MAAM,uBAAuB,CAAA;AAIvF;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CACzB;AAED;;;;;GAKG;AACH,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,YAAY,EAAE,oBAAoB,CAAA;CAC5C;AAED;;;;;GAKG;AACH,MAAM,WAAW,uBAAuB;IACtC;;;OAGG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CACjC;AAED;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAC7B,WAAW,SAAS,EACpB,UAAU,uBAAuB,KAChC,uBASF,CAAA"}
1
+ {"version":3,"file":"ServiceFnGenerator.d.ts","sourceRoot":"","sources":["../../../src/generator/ServiceFnGenerator.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,SAAS,EAAmC,MAAM,uBAAuB,CAAA;AAIvF;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CACzB;AAED;;;;;GAKG;AACH,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,YAAY,EAAE,oBAAoB,CAAA;CAC5C;AAED;;;;;GAKG;AACH,MAAM,WAAW,uBAAuB;IACtC;;OAEG;IACH,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAA;CAChC;AAED;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAC7B,WAAW,SAAS,EACpB,SAAS,uBAAuB,KAC/B,uBAQF,CAAA"}
@@ -13,9 +13,7 @@ export interface GeneratorOptions {
13
13
  /**
14
14
  * Add .js extensions to relative imports for ESM compatibility.
15
15
  * Required for moduleResolution: node16/nodenext.
16
- * Default: true (recommended for ESM projects)
17
- *
18
- * @default true
16
+ * @default false
19
17
  */
20
18
  readonly esmExtensions?: boolean;
21
19
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"GeneratorConfig.d.ts","sourceRoot":"","sources":["../../../src/model/GeneratorConfig.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;GAKG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;;;OAMG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAA;IAEhC;;OAEG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,eAAe,CAAA;CACrC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;AAEtD;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC5B;;;OAGG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;IAEtB;;;OAGG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,iBAAiB,CAAA;CACxC;AAED;;;;;GAKG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;OAGG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;IAEtB;;;OAGG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,iBAAiB,CAAA;CACxC;AAED;;;;;GAKG;AACH,MAAM,WAAW,eAAe;IAC9B;;;OAGG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAEjD;;;OAGG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAErD;;;OAGG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAA;IAExD;;;OAGG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,iBAAiB,CAAA;CACxC;AAED;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,GAC9B,WAAW,eAAe,GAAG,SAAS,EACtC,UAAU,MAAM,EAChB,UAAU,QAAQ,GAAG,SAAS,EAC9B,mBAAmB,MAAM,KACxB,MAAM,GAAG,SAkBX,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAC1B,WAAW,eAAe,GAAG,SAAS,EACtC,UAAU,MAAM,EAChB,UAAU,QAAQ,GAAG,SAAS,KAC7B,MAAM,GAAG,SAQX,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,GAC/B,WAAW,eAAe,GAAG,SAAS,EACtC,eAAe,MAAM,KACpB,MAAM,GAAG,SAGX,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,6BAA6B,GACxC,WAAW,eAAe,GAAG,SAAS,EACtC,eAAe,MAAM,EACrB,eAAe,MAAM,KACpB,MAAM,GAAG,SASX,CAAA"}
1
+ {"version":3,"file":"GeneratorConfig.d.ts","sourceRoot":"","sources":["../../../src/model/GeneratorConfig.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;GAKG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;OAIG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAA;IAEhC;;OAEG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,eAAe,CAAA;CACrC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;AAEtD;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC5B;;;OAGG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;IAEtB;;;OAGG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,iBAAiB,CAAA;CACxC;AAED;;;;;GAKG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;OAGG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;IAEtB;;;OAGG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,iBAAiB,CAAA;CACxC;AAED;;;;;GAKG;AACH,MAAM,WAAW,eAAe;IAC9B;;;OAGG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAEjD;;;OAGG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAErD;;;OAGG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAA;IAExD;;;OAGG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,iBAAiB,CAAA;CACxC;AAED;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,GAC9B,WAAW,eAAe,GAAG,SAAS,EACtC,UAAU,MAAM,EAChB,UAAU,QAAQ,GAAG,SAAS,EAC9B,mBAAmB,MAAM,KACxB,MAAM,GAAG,SAkBX,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAC1B,WAAW,eAAe,GAAG,SAAS,EACtC,UAAU,MAAM,EAChB,UAAU,QAAQ,GAAG,SAAS,KAC7B,MAAM,GAAG,SAQX,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,GAC/B,WAAW,eAAe,GAAG,SAAS,EACtC,eAAe,MAAM,KACpB,MAAM,GAAG,SAGX,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,6BAA6B,GACxC,WAAW,eAAe,GAAG,SAAS,EACtC,eAAe,MAAM,EACrB,eAAe,MAAM,KACpB,MAAM,GAAG,SASX,CAAA"}
package/dist/esm/Cli.js CHANGED
@@ -23,10 +23,30 @@ const serviceName = /*#__PURE__*/Options.text("service-name").pipe(Options.optio
23
23
  const packageName = /*#__PURE__*/Options.text("package-name").pipe(Options.optional, /*#__PURE__*/Options.withDescription("NPM package name (defaults to @template/<service-name>-effect)"));
24
24
  const force = /*#__PURE__*/Options.boolean("force").pipe(/*#__PURE__*/Options.withDefault(false), /*#__PURE__*/Options.withDescription("Overwrite existing files"));
25
25
  const filesOnly = /*#__PURE__*/Options.boolean("files-only").pipe(/*#__PURE__*/Options.withDefault(false), /*#__PURE__*/Options.withDescription("Generate only source files (no package.json, tsconfig, etc.) directly in output-dir"));
26
- const configFile = /*#__PURE__*/Options.file("config").pipe(Options.optional, /*#__PURE__*/Options.withDescription("Path to JSON config file with naming overrides"));
26
+ const configOption = /*#__PURE__*/Options.text("config").pipe(Options.optional, /*#__PURE__*/Options.withDescription(`Config as JSON string or path to JSON file. Options: { esmExtensions?: boolean, overrides?: NamingOverrides }. Example: --config '{"esmExtensions": true}'`));
27
27
  // ============================================================================
28
28
  // Generate Command
29
29
  // ============================================================================
30
+ /** Parse config from JSON string or file path */
31
+ const parseConfig = (configValue, fs) => Effect.gen(function* () {
32
+ // Try parsing as JSON first
33
+ const trimmed = configValue.trim();
34
+ if (trimmed.startsWith("{")) {
35
+ try {
36
+ return JSON.parse(trimmed);
37
+ } catch (e) {
38
+ yield* Effect.fail(new Error(`Failed to parse config JSON: ${e}`));
39
+ }
40
+ }
41
+ // Otherwise treat as file path
42
+ yield* Console.log(`Loading config from: ${configValue}`);
43
+ const configContent = yield* fs.readFileString(configValue).pipe(Effect.mapError(error => new Error(`Failed to read config file: ${configValue}. ${error}`)));
44
+ try {
45
+ return JSON.parse(configContent);
46
+ } catch (e) {
47
+ throw new Error(`Failed to parse config file: ${configValue}. ${e}`);
48
+ }
49
+ });
30
50
  const generateCommand = /*#__PURE__*/Command.make("generate", {
31
51
  metadataPath,
32
52
  outputDir,
@@ -34,9 +54,9 @@ const generateCommand = /*#__PURE__*/Command.make("generate", {
34
54
  packageName,
35
55
  force,
36
56
  filesOnly,
37
- configFile
57
+ configOption
38
58
  }).pipe(/*#__PURE__*/Command.withDescription("Generate Effect OData client from metadata"), /*#__PURE__*/Command.withHandler(({
39
- configFile: cfgFile,
59
+ configOption: cfgOption,
40
60
  filesOnly: onlyFiles,
41
61
  force: forceOverwrite,
42
62
  metadataPath: metaPath,
@@ -45,17 +65,13 @@ const generateCommand = /*#__PURE__*/Command.make("generate", {
45
65
  serviceName: svcName
46
66
  }) => Effect.gen(function* () {
47
67
  const fs = yield* FileSystem.FileSystem;
48
- // Load config file if provided
68
+ // Load config if provided (JSON string or file path)
69
+ let esmExtensions;
49
70
  let overrides;
50
- if (cfgFile._tag === "Some") {
51
- yield* Console.log(`Loading config from: ${cfgFile.value}`);
52
- const configContent = yield* fs.readFileString(cfgFile.value).pipe(Effect.mapError(error => new Error(`Failed to read config file: ${cfgFile.value}. ${error}`)));
53
- try {
54
- const parsed = JSON.parse(configContent);
55
- overrides = parsed.overrides;
56
- } catch (e) {
57
- throw new Error(`Failed to parse config file: ${cfgFile.value}. ${e}`);
58
- }
71
+ if (cfgOption._tag === "Some") {
72
+ const parsed = yield* parseConfig(cfgOption.value, fs);
73
+ esmExtensions = parsed.esmExtensions;
74
+ overrides = parsed.overrides;
59
75
  }
60
76
  yield* Console.log(`Reading metadata from: ${metaPath}`);
61
77
  // Read metadata file
@@ -80,6 +96,7 @@ const generateCommand = /*#__PURE__*/Command.make("generate", {
80
96
  force: forceOverwrite,
81
97
  filesOnly: onlyFiles,
82
98
  overrides,
99
+ esmExtensions,
83
100
  ...(svcName._tag === "Some" ? {
84
101
  serviceName: svcName.value
85
102
  } : {}),
@@ -1 +1 @@
1
- {"version":3,"file":"Cli.js","names":["Args","Command","Options","FileSystem","Console","Effect","digestMetadata","generate","parseODataMetadata","metadataPath","path","name","pipe","withDescription","outputDir","serviceName","text","optional","packageName","force","boolean","withDefault","filesOnly","configFile","file","generateCommand","make","withHandler","cfgFile","onlyFiles","forceOverwrite","metaPath","outDir","pkgName","svcName","gen","fs","overrides","_tag","log","value","configContent","readFileString","mapError","error","Error","parsed","JSON","parse","e","metadataContent","edmx","dataModel","version","namespace","entityTypes","size","complexTypes","enumTypes","entitySets","config","rootCommand","withSubcommands","cli","run"],"sources":["../../src/Cli.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"Cli.js","names":["Args","Command","Options","FileSystem","Console","Effect","digestMetadata","generate","parseODataMetadata","metadataPath","path","name","pipe","withDescription","outputDir","serviceName","text","optional","packageName","force","boolean","withDefault","filesOnly","configOption","parseConfig","configValue","fs","gen","trimmed","trim","startsWith","JSON","parse","e","fail","Error","log","configContent","readFileString","mapError","error","generateCommand","make","withHandler","cfgOption","onlyFiles","forceOverwrite","metaPath","outDir","pkgName","svcName","esmExtensions","overrides","_tag","parsed","value","metadataContent","edmx","dataModel","version","namespace","entityTypes","size","complexTypes","enumTypes","entitySets","config","rootCommand","withSubcommands","cli","run"],"sources":["../../src/Cli.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
@@ -37,7 +37,7 @@ export const generate = (dataModel, config) => Effect.gen(function* () {
37
37
  const serviceName = config.serviceName ?? dataModel.serviceName;
38
38
  const packageName = config.packageName ?? `@template/${serviceName.toLowerCase()}-effect`;
39
39
  const filesOnly = config.filesOnly ?? false;
40
- const esmExtensions = config.esmExtensions ?? true;
40
+ const esmExtensions = config.esmExtensions ?? false;
41
41
  // When filesOnly is true, output directly to outputDir; otherwise use outputDir/src
42
42
  const sourceDir = filesOnly ? outputDir : path.join(outputDir, "src");
43
43
  const packageConfig = {
@@ -1 +1 @@
1
- {"version":3,"file":"Generator.js","names":["FileSystem","Path","Effect","Schema","generateIndex","generateModels","generateNavigations","generateOperations","generatePackageJson","generateTsconfig","generateTsconfigBuild","generateTsconfigSrc","generateTsconfigTest","generateVitestConfig","generateQueryModels","generateServiceFns","GeneratorError","TaggedError","message","String","cause","optional","Unknown","generate","dataModel","config","gen","fs","path","outputDir","serviceName","packageName","toLowerCase","filesOnly","esmExtensions","sourceDir","join","packageConfig","generatorOptions","serviceResult","operationsResult","navigationResult","sourceFiles","content","servicesFile","fileName","operationsFile","navigationFiles","map","nav","packageFiles","files","makeDirectory","recursive","pipe","mapError","error","file","force","exists","logWarning","writeFileString","logInfo"],"sources":["../../../src/generator/Generator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"Generator.js","names":["FileSystem","Path","Effect","Schema","generateIndex","generateModels","generateNavigations","generateOperations","generatePackageJson","generateTsconfig","generateTsconfigBuild","generateTsconfigSrc","generateTsconfigTest","generateVitestConfig","generateQueryModels","generateServiceFns","GeneratorError","TaggedError","message","String","cause","optional","Unknown","generate","dataModel","config","gen","fs","path","outputDir","serviceName","packageName","toLowerCase","filesOnly","esmExtensions","sourceDir","join","packageConfig","generatorOptions","serviceResult","operationsResult","navigationResult","sourceFiles","content","servicesFile","fileName","operationsFile","navigationFiles","map","nav","packageFiles","files","makeDirectory","recursive","pipe","mapError","error","file","force","exists","logWarning","writeFileString","logInfo"],"sources":["../../../src/generator/Generator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
@@ -8,7 +8,9 @@ import { getOperationsModuleName } from "./OperationsGenerator.js";
8
8
  * @category generation
9
9
  */
10
10
  export const generateIndex = (dataModel, options) => {
11
- const esmExtensions = options?.esmExtensions ?? true;
11
+ const {
12
+ esmExtensions
13
+ } = options;
12
14
  const lines = [];
13
15
  // Header
14
16
  lines.push(`/**`);
@@ -1 +1 @@
1
- {"version":3,"file":"IndexGenerator.js","names":["formatRelativeImport","getEditableTypeName","getIdTypeName","getQueryFactoryName","getQueryInstanceName","getQueryInterfaceName","getServiceClassName","getPathBuildersModuleName","getOperationsModuleName","generateIndex","dataModel","options","esmExtensions","lines","push","serviceName","modelExports","enumType","enumTypes","values","name","complexType","complexTypes","entityType","entityTypes","keys","length","i","isLast","serviceExports","entitySet","entitySets","hasUnboundOperations","Array","from","operations","some","op","isBound","operationsModuleName","pathBuildersModuleName","queryExports","get","entityTypeFqName","join"],"sources":["../../../src/generator/IndexGenerator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"IndexGenerator.js","names":["formatRelativeImport","getEditableTypeName","getIdTypeName","getQueryFactoryName","getQueryInstanceName","getQueryInterfaceName","getServiceClassName","getPathBuildersModuleName","getOperationsModuleName","generateIndex","dataModel","options","esmExtensions","lines","push","serviceName","modelExports","enumType","enumTypes","values","name","complexType","complexTypes","entityType","entityTypes","keys","length","i","isLast","serviceExports","entitySet","entitySets","hasUnboundOperations","Array","from","operations","some","op","isBound","operationsModuleName","pathBuildersModuleName","queryExports","get","entityTypeFqName","join"],"sources":["../../../src/generator/IndexGenerator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
@@ -254,32 +254,23 @@ const generateEditableSchemaFields = properties => {
254
254
  * When the OData property name differs from the TypeScript property name,
255
255
  * we use Schema.fromKey to map between them.
256
256
  *
257
- * For optional fields (using Schema.optionalWith), we pipe fromKey directly
258
- * since optionalWith already returns a PropertySignature.
259
- *
260
- * For required fields, we wrap in Schema.propertySignature first.
261
- *
262
257
  * @example
263
258
  * // When odataName == name:
264
259
  * name: Schema.String
265
260
  *
266
- * // When odataName ("ID") != name ("id") - required field:
267
- * id: Schema.propertySignature(Schema.Number).pipe(Schema.fromKey("ID"))
261
+ * // When odataName ("ID") != name ("id"):
262
+ * id: Schema.Number.pipe(Schema.fromKey("ID"))
268
263
  *
269
264
  * // When odataName ("Name") != name ("name") - optional field:
270
- * name: Schema.optionalWith(Schema.String, { nullable: true }).pipe(Schema.fromKey("Name"))
265
+ * name: Schema.NullishOr(Schema.String).pipe(Schema.fromKey("Name"))
271
266
  */
272
- const getPropertyFieldDefinition = (prop, schemaType, isOptional) => {
267
+ const getPropertyFieldDefinition = (prop, schemaType, _isOptional) => {
273
268
  // If OData name matches TypeScript name, use simple format
274
269
  if (prop.odataName === prop.name) {
275
270
  return `${prop.name}: ${schemaType}`;
276
271
  }
277
- // If optional, Schema.optionalWith already returns a PropertySignature, so just pipe fromKey
278
- if (isOptional) {
279
- return `${prop.name}: ${schemaType}.pipe(Schema.fromKey("${prop.odataName}"))`;
280
- }
281
- // For required fields, wrap in propertySignature first, then pipe fromKey
282
- return `${prop.name}: Schema.propertySignature(${schemaType}).pipe(Schema.fromKey("${prop.odataName}"))`;
272
+ // Schema.fromKey works directly on schemas - no need for propertySignature wrapper
273
+ return `${prop.name}: ${schemaType}.pipe(Schema.fromKey("${prop.odataName}"))`;
283
274
  };
284
275
  /**
285
276
  * Get the Schema type for a property.
@@ -292,7 +283,7 @@ const getPropertySchemaType = (prop, makeOptional) => {
292
283
  }
293
284
  // Handle nullable/optional
294
285
  if (makeOptional) {
295
- return `Schema.optionalWith(${baseType}, { nullable: true })`;
286
+ return `Schema.NullishOr(${baseType})`;
296
287
  }
297
288
  return baseType;
298
289
  };
@@ -1 +1 @@
1
- {"version":3,"file":"ModelsGenerator.js","names":["getClassName","getEditableTypeName","getIdTypeName","getTypeDependencies","type","allComplexTypes","allEntityTypes","deps","Set","baseType","baseTypeName","split","pop","has","add","prop","properties","propTypeName","typeMapping","effectSchema","sortTypesByDependency","types","sorted","visited","visiting","visit","name","push","depName","depType","find","t","delete","needsODataSchemaImport","dataModel","checkProperties","some","p","startsWith","entityTypes","values","complexTypes","generateModels","lines","Array","from","map","serviceName","enumType","enumTypes","line","generateEnumType","sortedComplexTypes","complexType","generateComplexType","sortedEntityTypes","entityType","generateEntityType","join","members","m","odataName","fields","generateSchemaFields","navigationProperties","f","editableFields","generateEditableSchemaFields","editableName","keys","length","idTypeName","key","keySchema","getPropertySchemaType","keyFields","k","schema","filter","isKey","_navigationProperties","_dataModel","i","isOptional","isNullable","schemaType","isLast","fieldDef","getPropertyFieldDefinition","makeOptional","isCollection"],"sources":["../../../src/generator/ModelsGenerator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"ModelsGenerator.js","names":["getClassName","getEditableTypeName","getIdTypeName","getTypeDependencies","type","allComplexTypes","allEntityTypes","deps","Set","baseType","baseTypeName","split","pop","has","add","prop","properties","propTypeName","typeMapping","effectSchema","sortTypesByDependency","types","sorted","visited","visiting","visit","name","push","depName","depType","find","t","delete","needsODataSchemaImport","dataModel","checkProperties","some","p","startsWith","entityTypes","values","complexTypes","generateModels","lines","Array","from","map","serviceName","enumType","enumTypes","line","generateEnumType","sortedComplexTypes","complexType","generateComplexType","sortedEntityTypes","entityType","generateEntityType","join","members","m","odataName","fields","generateSchemaFields","navigationProperties","f","editableFields","generateEditableSchemaFields","editableName","keys","length","idTypeName","key","keySchema","getPropertySchemaType","keyFields","k","schema","filter","isKey","_navigationProperties","_dataModel","i","isOptional","isNullable","schemaType","isLast","fieldDef","getPropertyFieldDefinition","_isOptional","makeOptional","isCollection"],"sources":["../../../src/generator/ModelsGenerator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
@@ -90,7 +90,9 @@ const getDerivedTypes = (baseTypeFqName, dataModel) => {
90
90
  * @category generation
91
91
  */
92
92
  export const generateNavigations = (dataModel, options) => {
93
- const esmExtensions = options?.esmExtensions ?? true;
93
+ const {
94
+ esmExtensions
95
+ } = options;
94
96
  const moduleName = getPathBuildersModuleName();
95
97
  const content = generatePathBuildersFile(dataModel, esmExtensions);
96
98
  return {