@simplysm/sd-cli 7.0.272 → 7.0.275

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.
package/README.md CHANGED
@@ -78,9 +78,15 @@ sd-cli add ts-lib client-common "클라이언트 공통" --isForAngular
78
78
  sd-cli add db-lib main
79
79
  ```
80
80
 
81
+ * 해당 패키지의 package.json에 다음과같이 사용 DB에 맞는 패키지를 추가해야 합니다.
82
+ * mysql: mysql 패키지
83
+ * mssql: tedious 패키지
84
+ * sqlite: sqlite3 패키지
85
+
81
86
  추가 작업
82
87
  * [각 패키지에 orm 설정](docs/conf-orm.md)
83
88
  * [DB 라이브러리 패키지에 모델 추가](#DB-라이브러리-패키지에-모델-추가)
89
+ * [테스트 환경 구성](docs/add-tests.md)
84
90
 
85
91
  ### 패키지별 세부기능 추가
86
92
 
@@ -1,4 +1,4 @@
1
- import { isArrayExpression, isAssignmentExpression, isCallExpression, isClassDeclaration, isExportDeclaration, isExportDefaultDeclaration, isExportNamedDeclaration, isExportSpecifier, isExpressionStatement, isFunctionDeclaration, isIdentifier, isImportDeclaration, isImportDefaultSpecifier, isImportSpecifier, isMemberExpression, isObjectExpression, isSpreadElement, isStringLiteral, isVariableDeclaration, traverseFast } from "@babel/types";
1
+ import { isArrayExpression, isAssignmentExpression, isCallExpression, isClassDeclaration, isExportDeclaration, isExportDefaultDeclaration, isExportNamedDeclaration, isExportSpecifier, isExpressionStatement, isFunctionDeclaration, isIdentifier, isImportDeclaration, isImportDefaultSpecifier, isImportNamespaceSpecifier, isImportSpecifier, isMemberExpression, isObjectExpression, isSpreadElement, isStringLiteral, isVariableDeclaration, traverseFast } from "@babel/types";
2
2
  import babelParser from "@babel/parser";
3
3
  import { FsUtil } from "@simplysm/sd-core-node";
4
4
  import path from "path";
@@ -227,9 +227,10 @@ export class SdCliBbFileMetadata {
227
227
  return result;
228
228
  }
229
229
  }
230
- return undefined;
230
+ throw SdCliBbUtil.error(`'${name}'에 대한 선언을 찾을 수 없습니다.`, this.filePath);
231
+ // return undefined;
231
232
  }
232
- _findMetaFromInside(localName) {
233
+ _findMetaFromInside(localName, excludeExport) {
233
234
  const cache = this._findMetaFromInsideCache.get(localName);
234
235
  if (cache !== undefined)
235
236
  return cache;
@@ -237,7 +238,7 @@ export class SdCliBbFileMetadata {
237
238
  if (isClassDeclaration(rawMeta) && rawMeta.id.name === localName) {
238
239
  return new SdCliBbClassMetadata(this, rawMeta);
239
240
  }
240
- else if (isExportNamedDeclaration(rawMeta)) {
241
+ else if (!excludeExport && isExportNamedDeclaration(rawMeta)) {
241
242
  for (const specifier of rawMeta.specifiers) {
242
243
  if (isExportSpecifier(specifier)) {
243
244
  const exportedName = isIdentifier(specifier.exported) ? specifier.exported.name : undefined;
@@ -267,18 +268,34 @@ export class SdCliBbFileMetadata {
267
268
  return result;
268
269
  }
269
270
  }
271
+ else {
272
+ const localImportName = isIdentifier(specifier.local) ? specifier.local.name : undefined;
273
+ if (localImportName === undefined) {
274
+ throw SdCliBbUtil.error("예상치 못한 방식의 코드가 발견되었습니다.", this.filePath, rawMeta);
275
+ }
276
+ else if (exportedName !== localImportName) {
277
+ const result = this._findMetaFromInside(localImportName);
278
+ this._findMetaFromInsideCache.set(localImportName, result);
279
+ return result;
280
+ }
281
+ else {
282
+ const result = this._findMetaFromInside(localImportName, true);
283
+ this._findMetaFromInsideCache.set(localImportName, result);
284
+ return result;
285
+ }
286
+ }
270
287
  }
271
288
  }
272
289
  }
273
290
  }
274
- /*else if (isExportDefaultDeclaration(rawMeta) && localName === "default") {
275
- const result = this.getMetaFromRaw(rawMeta.declaration);
276
- if (Array.isArray(result)) {
277
- throw new NeverEntryError();
278
- }
279
- this._findMetaFromInsideCache.set(localName, result);
280
- return result;
281
- }*/
291
+ // else if (!excludeExport && isExportDefaultDeclaration(rawMeta) && localName === "default") {
292
+ // const result = this.getMetaFromRaw(rawMeta.declaration);
293
+ // if (Array.isArray(result)) {
294
+ // throw new NeverEntryError();
295
+ // }
296
+ // this._findMetaFromInsideCache.set(localName, result);
297
+ // return result;
298
+ // }
282
299
  else if (isImportDeclaration(rawMeta)) {
283
300
  for (const specifier of rawMeta.specifiers) {
284
301
  if (isImportSpecifier(specifier)) {
@@ -338,6 +355,23 @@ export class SdCliBbFileMetadata {
338
355
  }
339
356
  }
340
357
  }
358
+ else if (isImportNamespaceSpecifier(specifier)) {
359
+ if (specifier.local.name === localName) {
360
+ if (rawMeta.source.value.includes(".")) {
361
+ const moduleFilePath = path.resolve(path.dirname(this.filePath), rawMeta.source.value);
362
+ const result = {
363
+ filePath: moduleFilePath,
364
+ name: "*",
365
+ __TSdCliMetaRef__: "__TSdCliMetaRef__"
366
+ };
367
+ this._findMetaFromInsideCache.set(localName, result);
368
+ return result;
369
+ }
370
+ else {
371
+ throw SdCliBbUtil.error("예상치 못한 방식의 코드가 발견되었습니다.", this.filePath, rawMeta);
372
+ }
373
+ }
374
+ }
341
375
  }
342
376
  }
343
377
  else if (isVariableDeclaration(rawMeta)) {
@@ -482,4 +516,4 @@ export class SdCliBbFileMetadata {
482
516
  throw new NeverEntryError();
483
517
  }
484
518
  }
485
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliBbFileMetadata.js","sourceRoot":"","sources":["../../../src/ng-tools/babel/SdCliBbFileMetadata.ts"],"names":[],"mappings":"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"}
519
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliBbFileMetadata.js","sourceRoot":"","sources":["../../../src/ng-tools/babel/SdCliBbFileMetadata.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@simplysm/sd-cli",
3
- "version": "7.0.272",
3
+ "version": "7.0.275",
4
4
  "description": "심플리즘 패키지 - CLI",
5
5
  "author": "김석래",
6
6
  "repository": {
@@ -23,11 +23,11 @@
23
23
  "@babel/parser": "^7.17.0",
24
24
  "@babel/types": "^7.17.0",
25
25
  "@ngtools/webpack": "^13.2.2",
26
- "@simplysm/sd-core-common": "7.0.272",
27
- "@simplysm/sd-core-node": "7.0.272",
28
- "@simplysm/sd-service-common": "7.0.272",
29
- "@simplysm/sd-service-server": "7.0.272",
30
- "@simplysm/sd-storage": "7.0.272",
26
+ "@simplysm/sd-core-common": "7.0.275",
27
+ "@simplysm/sd-core-node": "7.0.275",
28
+ "@simplysm/sd-service-common": "7.0.275",
29
+ "@simplysm/sd-service-server": "7.0.275",
30
+ "@simplysm/sd-storage": "7.0.275",
31
31
  "browserslist": "^4.19.1",
32
32
  "chokidar": "^3.5.3",
33
33
  "connect": "^3.7.0",
@@ -15,6 +15,7 @@ import {
15
15
  isIdentifier,
16
16
  isImportDeclaration,
17
17
  isImportDefaultSpecifier,
18
+ isImportNamespaceSpecifier,
18
19
  isImportSpecifier,
19
20
  isMemberExpression,
20
21
  isObjectExpression,
@@ -271,12 +272,13 @@ export class SdCliBbFileMetadata {
271
272
  }
272
273
  }
273
274
 
274
- return undefined;
275
+ throw SdCliBbUtil.error(`'${name}'에 대한 선언을 찾을 수 없습니다.`, this.filePath);
276
+ // return undefined;
275
277
  }
276
278
 
277
279
  private readonly _findMetaFromInsideCache = new Map<string, TSdCliBbMetadata>();
278
280
 
279
- private _findMetaFromInside(localName: string): TSdCliBbMetadata {
281
+ private _findMetaFromInside(localName: string, excludeExport?: boolean): TSdCliBbMetadata {
280
282
  const cache = this._findMetaFromInsideCache.get(localName);
281
283
  if (cache !== undefined) return cache;
282
284
 
@@ -284,7 +286,7 @@ export class SdCliBbFileMetadata {
284
286
  if (isClassDeclaration(rawMeta) && rawMeta.id.name === localName) {
285
287
  return new SdCliBbClassMetadata(this, rawMeta);
286
288
  }
287
- else if (isExportNamedDeclaration(rawMeta)) {
289
+ else if (!excludeExport && isExportNamedDeclaration(rawMeta)) {
288
290
  for (const specifier of rawMeta.specifiers) {
289
291
  if (isExportSpecifier(specifier)) {
290
292
  const exportedName = isIdentifier(specifier.exported) ? specifier.exported.name : undefined;
@@ -314,18 +316,35 @@ export class SdCliBbFileMetadata {
314
316
  return result;
315
317
  }
316
318
  }
319
+ else {
320
+ const localImportName = isIdentifier(specifier.local) ? specifier.local.name : undefined;
321
+
322
+ if (localImportName === undefined) {
323
+ throw SdCliBbUtil.error("예상치 못한 방식의 코드가 발견되었습니다.", this.filePath, rawMeta);
324
+ }
325
+ else if (exportedName !== localImportName) {
326
+ const result = this._findMetaFromInside(localImportName);
327
+ this._findMetaFromInsideCache.set(localImportName, result);
328
+ return result;
329
+ }
330
+ else {
331
+ const result = this._findMetaFromInside(localImportName, true);
332
+ this._findMetaFromInsideCache.set(localImportName, result);
333
+ return result;
334
+ }
335
+ }
317
336
  }
318
337
  }
319
338
  }
320
339
  }
321
- /*else if (isExportDefaultDeclaration(rawMeta) && localName === "default") {
322
- const result = this.getMetaFromRaw(rawMeta.declaration);
323
- if (Array.isArray(result)) {
324
- throw new NeverEntryError();
325
- }
326
- this._findMetaFromInsideCache.set(localName, result);
327
- return result;
328
- }*/
340
+ // else if (!excludeExport && isExportDefaultDeclaration(rawMeta) && localName === "default") {
341
+ // const result = this.getMetaFromRaw(rawMeta.declaration);
342
+ // if (Array.isArray(result)) {
343
+ // throw new NeverEntryError();
344
+ // }
345
+ // this._findMetaFromInsideCache.set(localName, result);
346
+ // return result;
347
+ // }
329
348
  else if (isImportDeclaration(rawMeta)) {
330
349
  for (const specifier of rawMeta.specifiers) {
331
350
  if (isImportSpecifier(specifier)) {
@@ -385,6 +404,23 @@ export class SdCliBbFileMetadata {
385
404
  }
386
405
  }
387
406
  }
407
+ else if (isImportNamespaceSpecifier(specifier)) {
408
+ if (specifier.local.name === localName) {
409
+ if (rawMeta.source.value.includes(".")) {
410
+ const moduleFilePath = path.resolve(path.dirname(this.filePath), rawMeta.source.value);
411
+ const result = {
412
+ filePath: moduleFilePath,
413
+ name: "*",
414
+ __TSdCliMetaRef__: "__TSdCliMetaRef__" as const
415
+ };
416
+ this._findMetaFromInsideCache.set(localName, result);
417
+ return result;
418
+ }
419
+ else {
420
+ throw SdCliBbUtil.error("예상치 못한 방식의 코드가 발견되었습니다.", this.filePath, rawMeta);
421
+ }
422
+ }
423
+ }
388
424
  }
389
425
  }
390
426
  else if (isVariableDeclaration(rawMeta)) {