@rxap/ts-morph 1.1.0-dev.21 → 1.1.0-dev.22

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 (7) hide show
  1. package/CHANGELOG.md +7 -0
  2. package/README.md +1 -1
  3. package/package.json +4 -4
  4. package/src/lib/nest/coerce-nest-app-config.js +14 -1
  5. package/src/lib/nest/coerce-nest-app-config.js.map +1 -1
  6. package/src/lib/nest/coerce-nest-cache-module-import.js +1 -0
  7. package/src/lib/nest/coerce-nest-cache-module-import.js.map +1 -1
package/CHANGELOG.md CHANGED
@@ -3,6 +3,13 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ # [1.1.0-dev.22](https://gitlab.com/rxap/packages/compare/@rxap/ts-morph@1.1.0-dev.21...@rxap/ts-morph@1.1.0-dev.22) (2024-03-31)
7
+
8
+ ### Bug Fixes
9
+
10
+ - ensure default string value is wrapped in quotes ([2d16467](https://gitlab.com/rxap/packages/commit/2d16467015b36db9a67e9655961a961a576ef47f))
11
+ - import CacheModule as global module ([fe1b28e](https://gitlab.com/rxap/packages/commit/fe1b28e86aa282c4e06968e36328bc30d1283133))
12
+
6
13
  # [1.1.0-dev.21](https://gitlab.com/rxap/packages/compare/@rxap/ts-morph@1.1.0-dev.20...@rxap/ts-morph@1.1.0-dev.21) (2024-03-23)
7
14
 
8
15
  ### Bug Fixes
package/README.md CHANGED
@@ -17,5 +17,5 @@ yarn add @rxap/ts-morph
17
17
  ```
18
18
  **Install peer dependencies:**
19
19
  ```bash
20
- yarn add @rxap/utilities@^16.1.0-dev.7 ts-morph@^18.0.0 tslib@2.6.2
20
+ yarn add @rxap/utilities@^16.1.0-dev.8 ts-morph@^18.0.0 tslib@2.6.2
21
21
  ```
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
- "version": "1.1.0-dev.21",
2
+ "version": "1.1.0-dev.22",
3
3
  "name": "@rxap/ts-morph",
4
4
  "license": "GPL-3.0-or-later",
5
5
  "dependencies": {
6
6
  "tslib": "2.6.2"
7
7
  },
8
8
  "peerDependencies": {
9
- "@rxap/utilities": "^16.1.0-dev.7",
9
+ "@rxap/utilities": "^16.1.0-dev.8",
10
10
  "ts-morph": "^18.0.0",
11
11
  "tslib": "2.6.2"
12
12
  },
@@ -30,7 +30,7 @@
30
30
  "packageGroup": [
31
31
  {
32
32
  "package": "@rxap/utilities",
33
- "version": "16.1.0-dev.7"
33
+ "version": "16.1.0-dev.8"
34
34
  }
35
35
  ]
36
36
  },
@@ -44,7 +44,7 @@
44
44
  "directory": "packages/ts-morph"
45
45
  },
46
46
  "type": "commonjs",
47
- "gitHead": "c325cc61fc1c4180be0712a36ec43835a590af4f",
47
+ "gitHead": "88bb83e5ae16a958b2618d657587390058b48a3f",
48
48
  "main": "./src/index.js",
49
49
  "types": "./src/index.d.ts"
50
50
  }
package/src/lib/nest/coerce-nest-app-config.js CHANGED
@@ -65,7 +65,20 @@ function buildValidationSchemaExpressionValue(item) {
65
65
  w.write(`Joi.${(_a = item.type) !== null && _a !== void 0 ? _a : 'string'}()`);
66
66
  if (item.defaultValue) {
67
67
  if (typeof item.defaultValue === 'string') {
68
- w.write(`.default(${item.defaultValue})`);
68
+ if (item.type === 'string') {
69
+ w.write(`.default(`);
70
+ // wrap the string in single quotes if it is not already
71
+ if ((!item.defaultValue.startsWith("'") && !item.defaultValue.endsWith("'")) || (!item.defaultValue.startsWith('"') && !item.defaultValue.endsWith('"'))) {
72
+ w.quote(item.defaultValue);
73
+ }
74
+ else {
75
+ w.write(item.defaultValue);
76
+ }
77
+ w.write(`)`);
78
+ }
79
+ else {
80
+ w.write(`.default(${item.defaultValue})`);
81
+ }
69
82
  }
70
83
  else {
71
84
  w.write('.default(');
package/src/lib/nest/coerce-nest-app-config.js.map CHANGED
@@ -1 +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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"}
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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"}
package/src/lib/nest/coerce-nest-cache-module-import.js CHANGED
@@ -16,6 +16,7 @@ function CoerceNestCacheModuleImport(sourceFile, options) {
16
16
  ], importWriter: w => {
17
17
  w.writeLine('CacheModule.registerAsync(');
18
18
  ts_morph_1.Writers.object({
19
+ isGlobal: 'true',
19
20
  useClass: 'CacheModuleOptionsLoader',
20
21
  })(w);
21
22
  w.write(')');
package/src/lib/nest/coerce-nest-cache-module-import.js.map CHANGED
@@ -1 +1 @@
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,0BAA0B;aACrC,CAAC,CAAC,CAAC,CAAC,CAAC;YACN,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACf,CAAC,IAEJ,CAAC;AACJ,CAAC;AA3BD,kEA2BC"}
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"}