@rxap/ts-morph 1.1.0-dev.9 → 1.2.0-dev.0

package/src/lib/identifier.d.ts

@@ -0,0 +1,10 @@
+import { DataProperty, NormalizedDataProperty } from './data-property';
+export interface IdentifierOptions {
+    property: DataProperty;
+    source?: string;
+}
+export interface NormalizedIdentifierOptions {
+    property: NormalizedDataProperty;
+    source: string | null;
+}
+export declare function NormalizeAccordionIdentifier(identifier?: IdentifierOptions): NormalizedIdentifierOptions | null;

package/src/lib/identifier.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NormalizeAccordionIdentifier = void 0;
+const data_property_1 = require("./data-property");
+function NormalizeAccordionIdentifier(identifier) {
+    var _a;
+    if (!identifier || Object.keys(identifier).length === 0 || Object.keys(identifier.property).length === 0 || identifier.property.name === undefined) {
+        return null;
+    }
+    return {
+        property: (0, data_property_1.NormalizeDataProperty)(identifier.property),
+        source: (_a = identifier.source) !== null && _a !== void 0 ? _a : null,
+    };
+}
+exports.NormalizeAccordionIdentifier = NormalizeAccordionIdentifier;
+//# sourceMappingURL=identifier.js.map

package/src/lib/identifier.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"identifier.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/identifier.ts"],"names":[],"mappings":";;;AAAA,mDAIyB;AAYzB,SAAgB,4BAA4B,CAAC,UAA8B;;IACzE,IAAI,CAAC,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,KAAK,SAAS,EAAE;QAClJ,OAAO,IAAI,CAAC;KACb;IACD,OAAO;QACL,QAAQ,EAAE,IAAA,qCAAqB,EAAC,UAAU,CAAC,QAAQ,CAAC;QACpD,MAAM,EAAE,MAAA,UAAU,CAAC,MAAM,mCAAI,IAAI;KAClC,CAAC;AACJ,CAAC;AARD,oEAQC"}

package/src/lib/nest/add-health-endpoint.js

@@ -46,6 +46,7 @@ function AddHealthEndpoint(sourceFile, name) {
         parameterName: (0, utilities_1.camelize)(healthIndicatorClass),
         injectionToken: healthIndicatorClass,
         scope: ts_morph_1.Scope.Private,
+        module: coerce_dependency_injection_1.Module.NEST,
     }, [
         {
             moduleSpecifier: `./${(0, utilities_1.dasherize)(name)}.health-indicator`,

package/src/lib/nest/add-health-endpoint.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-health-endpoint.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/nest/add-health-endpoint.ts"],"names":[],"mappings":";;;AAAA,+CAIyB;AACzB,uCAGkB;AAClB,gFAA2E;AAE3E,SAAgB,iBAAiB,CAC/B,UAAsB,EACtB,IAAY;IAGZ,MAAM,gBAAgB,GAAG,UAAU,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;IAEjE,IAAI,CAAC,gBAAgB,EAAE;QACrB,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;KACtE;IAED,MAAM,oBAAoB,GAAG,GAAI,IAAA,oBAAQ,EAAC,IAAI,CAAE,iBAAiB,CAAC;IAElE,gBAAgB,CAAC,SAAS,CAAC;QACzB,IAAI,EAAE,IAAA,oBAAQ,EAAC,IAAI,CAAC;QACpB,UAAU,EAAE,4BAA4B;QACxC,UAAU,EAAE;YACV,CAAC,CAAC,EAAE;gBACF,CAAC,CAAC,SAAS,CAAC,4BAA4B,CAAC,CAAC;gBAC1C,CAAC,CAAC,SAAS,CAAC,oBAAqB,IAAA,oBAAQ,EAAC,oBAAoB,CAAE,eAAe,CAAC,CAAC;gBACjF,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACjB,CAAC;SACF;QACD,KAAK,EAAE,gBAAK,CAAC,MAAM;QACnB,UAAU,EAAE;YACV;gBACE,IAAI,EAAE,KAAK;gBACX,SAAS,EAAE,CAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAA,qBAAS,EAAC,IAAI,CAAC,CAAC,CAAE;aAC7C;YACD;gBACE,IAAI,EAAE,aAAa;gBACnB,SAAS,EAAE,EAAE;aACd;SACF;KACF,CAAC,CAAC;IAEH,UAAU,CAAC,qBAAqB,CAAC;QAC/B;YACE,eAAe,EAAE,kBAAkB;YACnC,YAAY,EAAE,CAAE,aAAa,EAAE,mBAAmB,CAAE;SACrD;QACD;YACE,eAAe,EAAE,gBAAgB;YACjC,YAAY,EAAE,CAAE,KAAK,CAAE;SACxB;KACF,CAAC,CAAC;IAEH,IAAA,uDAAyB,EACvB,UAAU,EACV;QACE,aAAa,EAAE,IAAA,oBAAQ,EAAC,oBAAoB,CAAC;QAC7C,cAAc,EAAE,oBAAoB;QACpC,KAAK,EAAE,gBAAK,CAAC,OAAO;KACrB,EACD;QACE;YACE,eAAe,EAAE,KAAM,IAAA,qBAAS,EAAC,IAAI,CAAE,mBAAmB;YAC1D,YAAY,EAAE,CAAE,oBAAoB,CAAE;SACvC;KACF,CACF,CAAC;AAEJ,CAAC;AA9DD,8CA8DC"}
+{"version":3,"file":"add-health-endpoint.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/nest/add-health-endpoint.ts"],"names":[],"mappings":";;;AAAA,+CAIyB;AACzB,uCAGkB;AAClB,gFAGwC;AAExC,SAAgB,iBAAiB,CAC/B,UAAsB,EACtB,IAAY;IAGZ,MAAM,gBAAgB,GAAG,UAAU,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;IAEjE,IAAI,CAAC,gBAAgB,EAAE;QACrB,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;KACtE;IAED,MAAM,oBAAoB,GAAG,GAAI,IAAA,oBAAQ,EAAC,IAAI,CAAE,iBAAiB,CAAC;IAElE,gBAAgB,CAAC,SAAS,CAAC;QACzB,IAAI,EAAE,IAAA,oBAAQ,EAAC,IAAI,CAAC;QACpB,UAAU,EAAE,4BAA4B;QACxC,UAAU,EAAE;YACV,CAAC,CAAC,EAAE;gBACF,CAAC,CAAC,SAAS,CAAC,4BAA4B,CAAC,CAAC;gBAC1C,CAAC,CAAC,SAAS,CAAC,oBAAqB,IAAA,oBAAQ,EAAC,oBAAoB,CAAE,eAAe,CAAC,CAAC;gBACjF,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACjB,CAAC;SACF;QACD,KAAK,EAAE,gBAAK,CAAC,MAAM;QACnB,UAAU,EAAE;YACV;gBACE,IAAI,EAAE,KAAK;gBACX,SAAS,EAAE,CAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAA,qBAAS,EAAC,IAAI,CAAC,CAAC,CAAE;aAC7C;YACD;gBACE,IAAI,EAAE,aAAa;gBACnB,SAAS,EAAE,EAAE;aACd;SACF;KACF,CAAC,CAAC;IAEH,UAAU,CAAC,qBAAqB,CAAC;QAC/B;YACE,eAAe,EAAE,kBAAkB;YACnC,YAAY,EAAE,CAAE,aAAa,EAAE,mBAAmB,CAAE;SACrD;QACD;YACE,eAAe,EAAE,gBAAgB;YACjC,YAAY,EAAE,CAAE,KAAK,CAAE;SACxB;KACF,CAAC,CAAC;IAEH,IAAA,uDAAyB,EACvB,UAAU,EACV;QACE,aAAa,EAAE,IAAA,oBAAQ,EAAC,oBAAoB,CAAC;QAC7C,cAAc,EAAE,oBAAoB;QACpC,KAAK,EAAE,gBAAK,CAAC,OAAO;QACpB,MAAM,EAAE,oCAAM,CAAC,IAAI;KACpB,EACD;QACE;YACE,eAAe,EAAE,KAAM,IAAA,qBAAS,EAAC,IAAI,CAAE,mBAAmB;YAC1D,YAAY,EAAE,CAAE,oBAAoB,CAAE;SACvC;KACF,CACF,CAAC;AAEJ,CAAC;AA/DD,8CA+DC"}

package/src/lib/nest/coerce-nest-app-config.js

@@ -65,7 +65,20 @@ function buildValidationSchemaExpressionValue(item) {
         w.write(`Joi.${(_a = item.type) !== null && _a !== void 0 ? _a : 'string'}()`);
         if (item.defaultValue) {
             if (typeof item.defaultValue === 'string') {
-                w.write(`.default(${item.defaultValue})`);
+                if (item.type === 'string') {
+                    w.write(`.default(`);
+                    // wrap the string in single quotes if it is not already
+                    if ((!item.defaultValue.startsWith("'") && !item.defaultValue.endsWith("'")) || (!item.defaultValue.startsWith('"') && !item.defaultValue.endsWith('"'))) {
+                        w.quote(item.defaultValue);
+                    }
+                    else {
+                        w.write(item.defaultValue);
+                    }
+                    w.write(`)`);
+                }
+                else {
+                    w.write(`.default(${item.defaultValue})`);
+                }
             }
             else {
                 w.write('.default(');

package/src/lib/nest/coerce-nest-app-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"coerce-nest-app-config.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/nest/coerce-nest-app-config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"coerce-nest-app-config.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/nest/coerce-nest-app-config.ts"],"names":[],"mappings":";;;AAAA,uCAIkB;AAClB,sDAAkD;AAClD,gFAA2E;AAc3E,SAAgB,mBAAmB,CAAC,UAAsB,EAAE,OAAmC;IAE7F,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAExC,MAAM,sBAAsB,GAAG,IAAA,uDAAyB,EAAC,UAAU,EAAE,kBAAkB,EAAE;QACvF,IAAI,EAAE,WAAW;QACjB,WAAW,EAAE,IAAI;KAClB,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;IAE1B,IAAA,8BAAa,EAAC,UAAU,EAAE;QACxB;YACE,YAAY,EAAE;gBACZ,WAAW;aACZ;YACD,eAAe,EAAE,KAAK;SACvB;QACD;YACE,eAAe,EAAE,KAAK;YACtB,eAAe,EAAE,KAAK;SACvB;KACF,CAAC,CAAC;IAEH,MAAM,yBAAyB,GAAG,IAAA,uDAAyB,EAAC,UAAU,EAAE,mBAAmB,EAAE;QAC3F,WAAW,EAAE,8BAA8B;KAC5C,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,sBAAsB,CAAC,oBAAoB,EAAG,CAAC,aAAa,EAAE,CAAC;IAChF,MAAM,WAAW,GAAG,yBAAyB,CAAC,oBAAoB,EAAG,CAAC,aAAa,EAAE,CAAC;IAEtF,MAAM,aAAa,GAAG,EAAE,CAAC;IAEzB,KAAK,IAAI,KAAK,GAAG,QAAQ,GAAG,CAAC,EAAE,KAAK,GAAG,WAAW,EAAE,KAAK,EAAE,EAAE;QAC3D,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;KACvD;IAED,MAAM,mBAAmB,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,qBAAU,CAAC,mBAAmB,CAAC,CAAC;IAE5G,MAAM,2BAA2B,GAAG,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAEtH,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE;QAC3B,MAAM,QAAQ,GAAG,2BAA2B,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE;aACT,UAAU,CAAC,qBAAsB,IAAI,CAAC,IAAK,IAAI,CAAC,CAAC,CAAC;QACjH,IAAI,QAAQ,EAAE;YACZ,IAAI,SAAS,EAAE;gBACb,QAAQ,CAAC,eAAe,CAAC,+BAA+B,CAAC,IAAI,CAAC,CAAC,CAAC;aACjE;SACF;aAAM;YACL,UAAU,CAAC,gBAAgB,CAAC,WAAW,EAAE,+BAA+B,CAAC,IAAI,CAAC,CAAC,CAAC;SACjF;KACF;AAEH,CAAC;AAnDD,kDAmDC;AAGD,SAAS,+BAA+B,CAAC,IAAoC;IAC3E,OAAO,CAAC,CAAC,EAAE;QACT,CAAC,CAAC,KAAK,CAAC,qBAAsB,IAAI,CAAC,IAAK,OAAO,CAAC,CAAC;QACjD,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,oCAAoC,CAAC,IAAI,CAAC,CAAC;QAC7F,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAChB;aAAM;YACL,KAAK,CAAC,CAAC,CAAC,CAAC;SACV;IACH,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,oCAAoC,CAAC,IAAqD;IACjG,OAAO,CAAC,CAAC,EAAE;;QACT,CAAC,CAAC,KAAK,CAAC,OAAQ,MAAA,IAAI,CAAC,IAAI,mCAAI,QAAS,IAAI,CAAC,CAAC;QAC5C,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,IAAI,OAAO,IAAI,CAAC,YAAY,KAAK,QAAQ,EAAE;gBACzC,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE;oBAC1B,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;oBACrB,wDAAwD;oBACxD,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE;wBACxJ,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;qBAC5B;yBAAM;wBACL,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;qBAC5B;oBACD,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;iBACd;qBAAM;oBACL,CAAC,CAAC,KAAK,CAAC,YAAa,IAAI,CAAC,YAAa,GAAG,CAAC,CAAC;iBAC7C;aACF;iBAAM;gBACL,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;gBACrB,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;gBACrB,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;aACd;SACF;QACD,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACf,CAAC,CAAC;AACJ,CAAC"}

package/src/lib/nest/coerce-nest-cache-module-import.d.ts

@@ -0,0 +1,4 @@
+import { SourceFile } from 'ts-morph';
+import { CoerceNestModuleImportOptions } from './coerce-nest-module-import';
+export type CoerceNestCacheModuleImportOptions = Omit<CoerceNestModuleImportOptions, 'moduleName'>;
+export declare function CoerceNestCacheModuleImport(sourceFile: SourceFile, options: CoerceNestCacheModuleImportOptions): void;

package/src/lib/nest/coerce-nest-cache-module-import.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CoerceNestCacheModuleImport = void 0;
+const ts_morph_1 = require("ts-morph");
+const coerce_nest_module_import_1 = require("./coerce-nest-module-import");
+function CoerceNestCacheModuleImport(sourceFile, options) {
+    (0, coerce_nest_module_import_1.CoerceNestModuleImport)(sourceFile, Object.assign(Object.assign({}, options), { moduleName: 'CacheModule', structures: [
+            {
+                moduleSpecifier: '@nestjs/cache-manager',
+                namedImports: ['CacheModule'],
+            },
+            {
+                moduleSpecifier: '@rxap/nest-utilities',
+                namedImports: ['CacheModuleOptionsLoader'],
+            }
+        ], importWriter: w => {
+            w.writeLine('CacheModule.registerAsync(');
+            ts_morph_1.Writers.object({
+                isGlobal: 'true',
+                useClass: 'CacheModuleOptionsLoader',
+            })(w);
+            w.write(')');
+        } }));
+}
+exports.CoerceNestCacheModuleImport = CoerceNestCacheModuleImport;
+//# sourceMappingURL=coerce-nest-cache-module-import.js.map

package/src/lib/nest/coerce-nest-cache-module-import.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"coerce-nest-cache-module-import.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/nest/coerce-nest-cache-module-import.ts"],"names":[],"mappings":";;;AAAA,uCAGkB;AAClB,2EAGqC;AAIrC,SAAgB,2BAA2B,CACzC,UAAsB,EACtB,OAA2C;IAE3C,IAAA,kDAAsB,EACpB,UAAU,kCACL,OAAO,KACV,UAAU,EAAE,aAAa,EACzB,UAAU,EAAE;YACV;gBACE,eAAe,EAAE,uBAAuB;gBACxC,YAAY,EAAE,CAAE,aAAa,CAAE;aAChC;YACD;gBACE,eAAe,EAAE,sBAAsB;gBACvC,YAAY,EAAE,CAAE,0BAA0B,CAAE;aAC7C;SACF,EACD,YAAY,EAAE,CAAC,CAAC,EAAE;YAChB,CAAC,CAAC,SAAS,CAAC,4BAA4B,CAAC,CAAC;YAC1C,kBAAO,CAAC,MAAM,CAAC;gBACb,QAAQ,EAAE,MAAM;gBAChB,QAAQ,EAAE,0BAA0B;aACrC,CAAC,CAAC,CAAC,CAAC,CAAC;YACN,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACf,CAAC,IAEJ,CAAC;AACJ,CAAC;AA5BD,kEA4BC"}

package/src/lib/type-import.d.ts

@@ -1,6 +1,16 @@
 import { ImportDeclarationStructure, OptionalKind } from 'ts-morph';
+export declare enum TypeNames {
+    String = "string",
+    Number = "number",
+    Boolean = "boolean",
+    Any = "any",
+    Unknown = "unknown",
+    Self = "<self>",
+    Deferred = "<deferred>"
+}
+export type TypeName = string | TypeNames;
 export interface TypeImport {
-    name: string;
+    name: TypeName;
     moduleSpecifier?: string | null;
     namedImport?: string | null;
     namespaceImport?: string | null;
@@ -11,12 +21,17 @@ export declare function IsTypeImport(value: any): value is TypeImport;
 export declare function RequiresTypeImport(typeImport: TypeImport): boolean;
 export declare function TypeImportToImportStructure(typeImport: TypeImport): OptionalKind<ImportDeclarationStructure>;
 export interface NormalizedTypeImport {
-    name: string;
+    /**
+     * The name of the type
+     * <self> indicates a self reference of the next object in the chain
+     * <deferred> indicates that the type is only known at runtime
+     */
+    name: TypeName;
     moduleSpecifier: string | null;
     namedImport: string | null;
     namespaceImport: string | null;
     isTypeOnly: boolean | null;
     defaultImport: string | null;
 }
-export declare function NormalizeTypeImport(typeImport?: Readonly<TypeImport> | string, defaultType?: string): NormalizedTypeImport;
+export declare function NormalizeTypeImport(typeImport?: Readonly<TypeImport> | string, defaultType?: TypeImport | string): NormalizedTypeImport;
 export declare function NormalizeTypeImportList(typeImportList?: Array<TypeImport | string>, defaultType?: string): NormalizedTypeImport[];

package/src/lib/type-import.js

@@ -1,6 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NormalizeTypeImportList = exports.NormalizeTypeImport = exports.TypeImportToImportStructure = exports.RequiresTypeImport = exports.IsTypeImport = void 0;
+exports.NormalizeTypeImportList = exports.NormalizeTypeImport = exports.TypeImportToImportStructure = exports.RequiresTypeImport = exports.IsTypeImport = exports.TypeNames = void 0;
+var TypeNames;
+(function (TypeNames) {
+    TypeNames["String"] = "string";
+    TypeNames["Number"] = "number";
+    TypeNames["Boolean"] = "boolean";
+    TypeNames["Any"] = "any";
+    TypeNames["Unknown"] = "unknown";
+    TypeNames["Self"] = "<self>";
+    TypeNames["Deferred"] = "<deferred>";
+})(TypeNames || (exports.TypeNames = TypeNames = {}));
 function IsTypeImport(value) {
     return typeof value === 'object' && typeof value.name === 'string';
 }
@@ -32,7 +42,7 @@ function TypeImportToImportStructure(typeImport) {
 }
 exports.TypeImportToImportStructure = TypeImportToImportStructure;
 function NormalizeTypeImport(typeImport, defaultType = 'unknown') {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     let name;
     let moduleSpecifier = null;
     let namedImport = null;
@@ -40,7 +50,17 @@ function NormalizeTypeImport(typeImport, defaultType = 'unknown') {
     let isTypeOnly = false;
     let defaultImport = null;
     if (!typeImport) {
-        name = defaultType;
+        if (typeof defaultType === 'string') {
+            name = defaultType;
+        }
+        else {
+            name = defaultType.name;
+            moduleSpecifier = (_a = defaultType.moduleSpecifier) !== null && _a !== void 0 ? _a : moduleSpecifier;
+            namedImport = (_b = defaultType.namedImport) !== null && _b !== void 0 ? _b : namedImport;
+            namespaceImport = (_c = defaultType.namespaceImport) !== null && _c !== void 0 ? _c : namespaceImport;
+            isTypeOnly = (_d = defaultType.isTypeOnly) !== null && _d !== void 0 ? _d : isTypeOnly;
+            defaultImport = (_e = defaultType.defaultImport) !== null && _e !== void 0 ? _e : defaultImport;
+        }
     }
     else if (typeof typeImport === 'string') {
         // name:moduleSpecifier:namedImport
@@ -52,11 +72,11 @@ function NormalizeTypeImport(typeImport, defaultType = 'unknown') {
     }
     else {
         name = typeImport.name;
-        moduleSpecifier = (_a = typeImport.moduleSpecifier) !== null && _a !== void 0 ? _a : moduleSpecifier;
-        namedImport = (_b = typeImport.namedImport) !== null && _b !== void 0 ? _b : namedImport;
-        namespaceImport = (_c = typeImport.namespaceImport) !== null && _c !== void 0 ? _c : namespaceImport;
-        isTypeOnly = (_d = typeImport.isTypeOnly) !== null && _d !== void 0 ? _d : isTypeOnly;
-        defaultImport = (_e = typeImport.defaultImport) !== null && _e !== void 0 ? _e : defaultImport;
+        moduleSpecifier = (_f = typeImport.moduleSpecifier) !== null && _f !== void 0 ? _f : moduleSpecifier;
+        namedImport = (_g = typeImport.namedImport) !== null && _g !== void 0 ? _g : namedImport;
+        namespaceImport = (_h = typeImport.namespaceImport) !== null && _h !== void 0 ? _h : namespaceImport;
+        isTypeOnly = (_j = typeImport.isTypeOnly) !== null && _j !== void 0 ? _j : isTypeOnly;
+        defaultImport = (_k = typeImport.defaultImport) !== null && _k !== void 0 ? _k : defaultImport;
     }
     return {
         name,

package/src/lib/type-import.js.map

@@ -1 +1 @@
-{"version":3,"file":"type-import.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/type-import.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"type-import.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/type-import.ts"],"names":[],"mappings":"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"}

package/src/lib/upstream-options.d.ts

@@ -6,38 +6,80 @@ export type UpstreamOptions = OpenApiUpstreamOptions | BaseUpstreamOptions;
 export type NormalizedUpstreamOptions = NormalizedOpenApiUpstreamOptions | NormalizedBaseUpstreamOptions;
 export interface BaseUpstreamOptions {
     kind: UpstreamOptionsKinds;
+    mapper?: RequestMapper;
 }
-export interface NormalizedBaseUpstreamOptions extends Readonly<Normalized<BaseUpstreamOptions>> {
+export interface NormalizedBaseUpstreamOptions<Mapper extends NormalizedRequestMapper = NormalizedRequestMapper> extends Readonly<Normalized<BaseUpstreamOptions>> {
     kind: UpstreamOptionsKinds;
+    mapper: Mapper | null;
 }
 export declare function NormalizeBaseUpstreamOptions(options: BaseUpstreamOptions): NormalizedBaseUpstreamOptions;
-export interface CommandMapper {
+export type RequestMapper = PagedRequestMapper | BaseRequestMapper | OptionsRequestMapper | ResolveRequestMapper;
+export type NormalizedRequestMapper = NormalizedPagedRequestMapper | NormalizedBaseRequestMapper | NormalizedOptionsRequestMapper | NormalizedResolveRequestMapper;
+export declare function NormalizeRequestMapper(mapper?: RequestMapper | null): NormalizedRequestMapper | null;
+export declare enum RequestMapperKinds {
+    DEFAULT = "default",
+    PAGED = "paged",
+    OPTIONS = "options",
+    Resolve = "resolve"
+}
+export interface BaseRequestMapper {
+    kind: RequestMapperKinds;
+}
+export interface NormalizedBaseRequestMapper extends Readonly<Normalized<BaseRequestMapper>> {
+    kind: RequestMapperKinds.DEFAULT;
+}
+export declare function NormalizeBaseRequestMapper(mapper: BaseRequestMapper): NormalizedBaseRequestMapper;
+export declare function IsNormalizedBaseRequestMapper(mapper: NormalizedRequestMapper): mapper is NormalizedBaseRequestMapper;
+export interface PagedRequestMapper extends BaseRequestMapper {
     pageIndex?: string;
     pageSize?: string;
     sortBy?: string;
     sortDirection?: string;
     list?: string;
     total?: string;
-    value?: string;
     filter?: {
         eq: string;
         join: string;
     };
 }
-export interface NormalizedCommandMapper extends Readonly<Normalized<CommandMapper>> {
+export interface NormalizedPagedRequestMapper extends Readonly<Normalized<PagedRequestMapper>> {
+    kind: RequestMapperKinds.PAGED;
     filter: {
         eq: string;
         join: string;
     } | null;
 }
-export declare function NormalizeCommandMapper(mapper?: CommandMapper | null): NormalizedCommandMapper | null;
+export declare function NormalizePagedRequestMapper(mapper: PagedRequestMapper): NormalizedPagedRequestMapper;
+export declare function IsNormalizedPagedRequestMapper(mapper: NormalizedRequestMapper): mapper is NormalizedPagedRequestMapper;
+export declare enum ToOptionsFunction {
+    TO_OPTIONS = "ToOptions",
+    TO_OPTIONS_FROM_OBJECT = "ToOptionsFromObject"
+}
+export interface OptionsRequestMapper extends BaseRequestMapper {
+    toFunction?: ToOptionsFunction;
+    toValue?: string;
+    toDisplay?: string;
+}
+export interface NormalizedOptionsRequestMapper extends Readonly<Normalized<OptionsRequestMapper>> {
+    kind: RequestMapperKinds.OPTIONS;
+    toFunction: ToOptionsFunction;
+}
+export declare function NormalizeOptionsRequestMapper(mapper: OptionsRequestMapper): NormalizedOptionsRequestMapper;
+export declare function IsNormalizedOptionsRequestMapper(mapper: NormalizedRequestMapper): mapper is NormalizedOptionsRequestMapper;
+export interface ResolveRequestMapper extends BaseRequestMapper {
+    value?: string;
+}
+export interface NormalizedResolveRequestMapper extends Readonly<Normalized<ResolveRequestMapper>> {
+    kind: RequestMapperKinds.Resolve;
+}
+export declare function NormalizeResolveRequestMapper(mapper: ResolveRequestMapper): NormalizedResolveRequestMapper;
+export declare function IsNormalizedResolveRequestMapper(mapper: NormalizedRequestMapper): mapper is NormalizedResolveRequestMapper;
 export interface OpenApiUpstreamOptions extends BaseUpstreamOptions {
     operationId: string;
     isService?: boolean;
     scope?: string;
-    mapper?: CommandMapper;
 }
-export interface NormalizedOpenApiUpstreamOptions extends Readonly<Normalized<OpenApiUpstreamOptions>> {
+export interface NormalizedOpenApiUpstreamOptions extends Readonly<Normalized<Omit<OpenApiUpstreamOptions, keyof NormalizedBaseUpstreamOptions>>>, NormalizedBaseUpstreamOptions {
     kind: UpstreamOptionsKinds.OPEN_API;
 }
 export declare function NormalizeOpenApiUpstreamOptions(options: OpenApiUpstreamOptions): NormalizedOpenApiUpstreamOptions;

package/src/lib/upstream-options.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NormalizeUpstreamOptions = exports.IsNormalizedOpenApiUpstreamOptions = exports.NormalizeOpenApiUpstreamOptions = exports.NormalizeCommandMapper = exports.NormalizeBaseUpstreamOptions = exports.UpstreamOptionsKinds = void 0;
+exports.NormalizeUpstreamOptions = exports.IsNormalizedOpenApiUpstreamOptions = exports.NormalizeOpenApiUpstreamOptions = exports.IsNormalizedResolveRequestMapper = exports.NormalizeResolveRequestMapper = exports.IsNormalizedOptionsRequestMapper = exports.NormalizeOptionsRequestMapper = exports.ToOptionsFunction = exports.IsNormalizedPagedRequestMapper = exports.NormalizePagedRequestMapper = exports.IsNormalizedBaseRequestMapper = exports.NormalizeBaseRequestMapper = exports.RequestMapperKinds = exports.NormalizeRequestMapper = exports.NormalizeBaseUpstreamOptions = exports.UpstreamOptionsKinds = void 0;
 var UpstreamOptionsKinds;
 (function (UpstreamOptionsKinds) {
     UpstreamOptionsKinds["OPEN_API"] = "open-api";
@@ -8,32 +8,86 @@ var UpstreamOptionsKinds;
 function NormalizeBaseUpstreamOptions(options) {
     return Object.freeze({
         kind: options.kind,
+        mapper: NormalizeRequestMapper(options.mapper),
     });
 }
 exports.NormalizeBaseUpstreamOptions = NormalizeBaseUpstreamOptions;
-function NormalizeCommandMapper(mapper) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+function NormalizeRequestMapper(mapper) {
     if (!mapper || Object.keys(mapper).length === 0) {
         return null;
     }
+    switch (mapper.kind) {
+        default:
+        case RequestMapperKinds.DEFAULT:
+            return NormalizeBaseRequestMapper(mapper);
+        case RequestMapperKinds.PAGED:
+            return NormalizePagedRequestMapper(mapper);
+        case RequestMapperKinds.OPTIONS:
+            return NormalizeOptionsRequestMapper(mapper);
+        case RequestMapperKinds.Resolve:
+            return NormalizeResolveRequestMapper(mapper);
+    }
+}
+exports.NormalizeRequestMapper = NormalizeRequestMapper;
+// endregion
+// region BaseRequestMapper
+var RequestMapperKinds;
+(function (RequestMapperKinds) {
+    RequestMapperKinds["DEFAULT"] = "default";
+    RequestMapperKinds["PAGED"] = "paged";
+    RequestMapperKinds["OPTIONS"] = "options";
+    RequestMapperKinds["Resolve"] = "resolve";
+})(RequestMapperKinds || (exports.RequestMapperKinds = RequestMapperKinds = {}));
+function NormalizeBaseRequestMapper(mapper) {
     return Object.freeze({
-        pageIndex: (_a = mapper.pageIndex) !== null && _a !== void 0 ? _a : null,
-        pageSize: (_b = mapper.pageSize) !== null && _b !== void 0 ? _b : null,
-        sortBy: (_c = mapper.sortBy) !== null && _c !== void 0 ? _c : null,
-        list: (_d = mapper.list) !== null && _d !== void 0 ? _d : null,
-        total: (_e = mapper.total) !== null && _e !== void 0 ? _e : null,
-        value: (_f = mapper.value) !== null && _f !== void 0 ? _f : null,
-        sortDirection: (_g = mapper.sortDirection) !== null && _g !== void 0 ? _g : null,
-        filter: mapper.filter && Object.keys((_h = mapper.filter) !== null && _h !== void 0 ? _h : {}).length ? {
+        kind: RequestMapperKinds.DEFAULT,
+    });
+}
+exports.NormalizeBaseRequestMapper = NormalizeBaseRequestMapper;
+function IsNormalizedBaseRequestMapper(mapper) {
+    return mapper.kind === RequestMapperKinds.DEFAULT;
+}
+exports.IsNormalizedBaseRequestMapper = IsNormalizedBaseRequestMapper;
+function NormalizePagedRequestMapper(mapper) {
+    var _a, _b, _c, _d, _e, _f, _g;
+    return Object.freeze(Object.assign(Object.assign({}, NormalizeBaseRequestMapper(mapper)), { kind: RequestMapperKinds.PAGED, pageIndex: (_a = mapper.pageIndex) !== null && _a !== void 0 ? _a : null, pageSize: (_b = mapper.pageSize) !== null && _b !== void 0 ? _b : null, sortBy: (_c = mapper.sortBy) !== null && _c !== void 0 ? _c : null, list: (_d = mapper.list) !== null && _d !== void 0 ? _d : null, total: (_e = mapper.total) !== null && _e !== void 0 ? _e : null, sortDirection: (_f = mapper.sortDirection) !== null && _f !== void 0 ? _f : null, filter: mapper.filter && Object.keys((_g = mapper.filter) !== null && _g !== void 0 ? _g : {}).length ? {
             eq: mapper.filter.eq,
             join: mapper.filter.join,
-        } : null,
-    });
+        } : null }));
+}
+exports.NormalizePagedRequestMapper = NormalizePagedRequestMapper;
+function IsNormalizedPagedRequestMapper(mapper) {
+    return mapper.kind === RequestMapperKinds.PAGED;
+}
+exports.IsNormalizedPagedRequestMapper = IsNormalizedPagedRequestMapper;
+// endregion
+// region OptionsRequestMapper
+var ToOptionsFunction;
+(function (ToOptionsFunction) {
+    ToOptionsFunction["TO_OPTIONS"] = "ToOptions";
+    ToOptionsFunction["TO_OPTIONS_FROM_OBJECT"] = "ToOptionsFromObject";
+})(ToOptionsFunction || (exports.ToOptionsFunction = ToOptionsFunction = {}));
+function NormalizeOptionsRequestMapper(mapper) {
+    var _a, _b, _c;
+    return Object.freeze(Object.assign(Object.assign({}, NormalizeBaseRequestMapper(mapper)), { kind: RequestMapperKinds.OPTIONS, toFunction: (_a = mapper.toFunction) !== null && _a !== void 0 ? _a : ToOptionsFunction.TO_OPTIONS, toValue: (_b = mapper.toValue) !== null && _b !== void 0 ? _b : null, toDisplay: (_c = mapper.toDisplay) !== null && _c !== void 0 ? _c : null }));
+}
+exports.NormalizeOptionsRequestMapper = NormalizeOptionsRequestMapper;
+function IsNormalizedOptionsRequestMapper(mapper) {
+    return mapper.kind === RequestMapperKinds.OPTIONS;
+}
+exports.IsNormalizedOptionsRequestMapper = IsNormalizedOptionsRequestMapper;
+function NormalizeResolveRequestMapper(mapper) {
+    var _a;
+    return Object.freeze(Object.assign(Object.assign({}, NormalizeBaseRequestMapper(mapper)), { kind: RequestMapperKinds.Resolve, value: (_a = mapper.value) !== null && _a !== void 0 ? _a : null }));
+}
+exports.NormalizeResolveRequestMapper = NormalizeResolveRequestMapper;
+function IsNormalizedResolveRequestMapper(mapper) {
+    return mapper.kind === RequestMapperKinds.Resolve;
 }
-exports.NormalizeCommandMapper = NormalizeCommandMapper;
+exports.IsNormalizedResolveRequestMapper = IsNormalizedResolveRequestMapper;
 function NormalizeOpenApiUpstreamOptions(options) {
     var _a, _b;
-    return Object.freeze(Object.assign(Object.assign({}, NormalizeBaseUpstreamOptions(options)), { kind: UpstreamOptionsKinds.OPEN_API, operationId: options.operationId, mapper: NormalizeCommandMapper(options.mapper), scope: (_a = options.scope) !== null && _a !== void 0 ? _a : null, isService: (_b = options.isService) !== null && _b !== void 0 ? _b : false }));
+    return Object.freeze(Object.assign(Object.assign({}, NormalizeBaseUpstreamOptions(options)), { kind: UpstreamOptionsKinds.OPEN_API, operationId: options.operationId, scope: (_a = options.scope) !== null && _a !== void 0 ? _a : null, isService: (_b = options.isService) !== null && _b !== void 0 ? _b : false }));
 }
 exports.NormalizeOpenApiUpstreamOptions = NormalizeOpenApiUpstreamOptions;
 function IsNormalizedOpenApiUpstreamOptions(options) {

package/src/lib/upstream-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"upstream-options.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/upstream-options.ts"],"names":[],"mappings":";;;AAEA,IAAY,oBAEX;AAFD,WAAY,oBAAoB;IAC9B,6CAAqB,CAAA;AACvB,CAAC,EAFW,oBAAoB,oCAApB,oBAAoB,QAE/B;AAgBD,SAAgB,4BAA4B,CAAC,OAA4B;IACvE,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,IAAI,EAAE,OAAO,CAAC,IAAI;KACnB,CAAC,CAAC;AACL,CAAC;AAJD,oEAIC;AA2BD,SAAgB,sBAAsB,CAAC,MAA6B;;IAClE,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QAC/C,OAAO,IAAI,CAAC;KACb;IACD,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,SAAS,EAAE,MAAA,MAAM,CAAC,SAAS,mCAAI,IAAI;QACnC,QAAQ,EAAE,MAAA,MAAM,CAAC,QAAQ,mCAAI,IAAI;QACjC,MAAM,EAAE,MAAA,MAAM,CAAC,MAAM,mCAAI,IAAI;QAC7B,IAAI,EAAE,MAAA,MAAM,CAAC,IAAI,mCAAI,IAAI;QACzB,KAAK,EAAE,MAAA,MAAM,CAAC,KAAK,mCAAI,IAAI;QAC3B,KAAK,EAAE,MAAA,MAAM,CAAC,KAAK,mCAAI,IAAI;QAC3B,aAAa,EAAE,MAAA,MAAM,CAAC,aAAa,mCAAI,IAAI;QAC3C,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,MAAA,MAAM,CAAC,MAAM,mCAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YACjE,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE;YACpB,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI;SACzB,CAAC,CAAC,CAAC,IAAI;KACT,CAAC,CAAC;AACL,CAAC;AAjBD,wDAiBC;AAiBD,SAAgB,+BAA+B,CAAC,OAA+B;;IAC7E,OAAO,MAAM,CAAC,MAAM,iCACf,4BAA4B,CAAC,OAAO,CAAC,KACxC,IAAI,EAAE,oBAAoB,CAAC,QAAQ,EACnC,WAAW,EAAE,OAAO,CAAC,WAAW,EAChC,MAAM,EAAE,sBAAsB,CAAC,OAAO,CAAC,MAAM,CAAC,EAC9C,KAAK,EAAE,MAAA,OAAO,CAAC,KAAK,mCAAI,IAAI,EAC5B,SAAS,EAAE,MAAA,OAAO,CAAC,SAAS,mCAAI,KAAK,IACrC,CAAC;AACL,CAAC;AATD,0EASC;AAED,SAAgB,kCAAkC,CAAC,OAAkC;IACnF,OAAO,OAAO,CAAC,IAAI,KAAK,oBAAoB,CAAC,QAAQ,CAAC;AACxD,CAAC;AAFD,gFAEC;AAED,YAAY;AAEZ,SAAgB,wBAAwB,CAAC,OAAyB;IAChE,IAAI,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QACjD,OAAO,IAAI,CAAC;KACb;IACD,QAAQ,OAAO,CAAC,IAAI,EAAE;QACpB,KAAK,oBAAoB,CAAC,QAAQ;YAChC,OAAO,+BAA+B,CAAC,OAAiC,CAAC,CAAC;KAC7E;AACH,CAAC;AARD,4DAQC"}
+{"version":3,"file":"upstream-options.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/upstream-options.ts"],"names":[],"mappings":"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"}