rename

sue71 · Sep 4, 2019 · 452a155 · 452a155
1 parent 7a8bcc9
commit 452a155
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 35 deletions.
diff --git a/dist/astFactories/importModule.js → dist/astFactories/importClause.js b/dist/astFactories/importModule.js → dist/astFactories/importClause.js
@@ -10,6 +10,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var ts = __importStar(require("typescript"));
 //_______________________________________________________
 //
-exports.importModule = function (fileInfo, constants) {
-    return ts.createImportDeclaration(undefined, undefined, ts.createImportClause(undefined, ts.createNamespaceImport(ts.createIdentifier(constants.MODULE))), ts.createStringLiteral(fileInfo.importModulePath));
+exports.importClause = function (name, from) {
+    return ts.createImportDeclaration(undefined, undefined, ts.createImportClause(undefined, ts.createNamespaceImport(ts.createIdentifier(name))), ts.createStringLiteral(from));
 };
diff --git a/dist/astFactories/importByLiteral.js → dist/astFactories/importDeclaration.js b/dist/astFactories/importByLiteral.js → dist/astFactories/importDeclaration.js
@@ -10,6 +10,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var ts = __importStar(require("typescript"));
 //_______________________________________________________
 //
-exports.importByLiteral = function (literal) {
+exports.importDeclaration = function (literal) {
     return ts.createImportDeclaration(undefined, undefined, undefined, ts.createStringLiteral(literal));
 };
diff --git a/dist/createModuleAst/index.js b/dist/createModuleAst/index.js
@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var importModule_1 = require("../astFactories/importModule");
-var importByLiteral_1 = require("../astFactories/importByLiteral");
+var importClause_1 = require("../astFactories/importClause");
+var importDeclaration_1 = require("../astFactories/importDeclaration");
 var declareModule_1 = require("../astFactories/declareModule");
 var createInterfaceForModules_1 = require("./createInterfaceForModules");
 var createInterfaceForLocalState_1 = require("./createInterfaceForLocalState");
@@ -11,8 +11,8 @@ var createInterfaceForLocalContext_1 = require("./createInterfaceForLocalContext
 //_______________________________________________________
 //
 exports.createModuleAst = function (sourceFile, fileInfo, constants) { return [
-    importModule_1.importModule(fileInfo, constants),
-    importByLiteral_1.importByLiteral(constants.VUEX),
+    importClause_1.importClause(constants.MODULE, fileInfo.importModulePath),
+    importDeclaration_1.importDeclaration(constants.VUEX),
     declareModule_1.declareModule(constants.VUEX, [
         createInterfaceForModules_1.createInterfaceForModules(fileInfo, constants),
         createInterfaceForLocalState_1.createInterfaceForLocalState(fileInfo, constants),

diff --git a/dist/createShimsAst/index.js b/dist/createShimsAst/index.js
@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var importByLiteral_1 = require("../astFactories/importByLiteral");
+var importDeclaration_1 = require("../astFactories/importDeclaration");
 var declareModule_1 = require("../astFactories/declareModule");
 var argument2_1 = require("./argument2");
 var strictCommit_1 = require("./strictCommit");
@@ -12,7 +12,7 @@ var rootContext_1 = require("./rootContext");
 //_______________________________________________________
 //
 exports.createShimsAst = function (fileInfos, constants) { return [
-    importByLiteral_1.importByLiteral(constants.VUEX),
+    importDeclaration_1.importDeclaration(constants.VUEX),
     declareModule_1.declareModule(constants.VUEX, [
         argument2_1.argument2(constants)
     ].concat(strictCommit_1.strictCommit(constants), strictDispatch_1.strictDispatch(constants), [

diff --git a/src/astFactories/importClause.ts b/src/astFactories/importClause.ts
@@ -0,0 +1,13 @@
+import * as ts from 'typescript'
+//_______________________________________________________
+//
+export const importClause = (name: string, from: string) =>
+  ts.createImportDeclaration(
+    undefined,
+    undefined,
+    ts.createImportClause(
+      undefined,
+      ts.createNamespaceImport(ts.createIdentifier(name))
+    ),
+    ts.createStringLiteral(from)
+  )
diff --git a/src/astFactories/importByLiteral.ts → src/astFactories/importDeclaration.ts b/src/astFactories/importByLiteral.ts → src/astFactories/importDeclaration.ts
@@ -1,7 +1,7 @@
 import * as ts from 'typescript'
 //_______________________________________________________
 //
-export const importByLiteral = (literal: string) =>
+export const importDeclaration = (literal: string) =>
   ts.createImportDeclaration(
     undefined,
     undefined,

diff --git a/src/astFactories/importModule.ts b/src/astFactories/importModule.ts
diff --git a/src/createModuleAst/index.ts b/src/createModuleAst/index.ts
@@ -1,7 +1,7 @@
 import * as ts from 'typescript'
 import { FileInfo, Constants } from '../types'
-import { importModule } from '../astFactories/importModule'
-import { importByLiteral } from '../astFactories/importByLiteral'
+import { importClause } from '../astFactories/importClause'
+import { importDeclaration } from '../astFactories/importDeclaration'
 import { declareModule } from '../astFactories/declareModule'
 import { createInterfaceForModules } from './createInterfaceForModules'
 import { createInterfaceForLocalState } from './createInterfaceForLocalState'
@@ -15,8 +15,8 @@ export const createModuleAst = (
   fileInfo: FileInfo,
   constants: Constants
 ) => [
-  importModule(fileInfo, constants),
-  importByLiteral(constants.VUEX),
+  importClause(constants.MODULE, fileInfo.importModulePath),
+  importDeclaration(constants.VUEX),
   declareModule(constants.VUEX, [
     createInterfaceForModules(fileInfo, constants),
     createInterfaceForLocalState(fileInfo, constants),

diff --git a/src/createShimsAst/index.ts b/src/createShimsAst/index.ts
@@ -1,5 +1,5 @@
 import { Constants, FileInfo } from '../types'
-import { importByLiteral } from '../astFactories/importByLiteral'
+import { importDeclaration } from '../astFactories/importDeclaration'
 import { declareModule } from '../astFactories/declareModule'
 import { argument2 } from './argument2'
 import { strictCommit } from './strictCommit'
@@ -14,7 +14,7 @@ export const createShimsAst = (
   fileInfos: FileInfo[],
   constants: Constants
 ) => [
-  importByLiteral(constants.VUEX),
+  importDeclaration(constants.VUEX),
   declareModule(constants.VUEX, [
     argument2(constants),
     ...strictCommit(constants),