@sasjs/utils 2.37.0 → 2.39.0
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/compileTree/compileTree.js +1 -1
- package/compileTree/compileTree.js.map +1 -1
- package/formatter/index.d.ts +1 -0
- package/formatter/index.js +3 -1
- package/formatter/index.js.map +1 -1
- package/formatter/regexp.d.ts +1 -0
- package/formatter/regexp.js +9 -0
- package/formatter/regexp.js.map +1 -0
- package/package.json +1 -1
- package/sasjsCli/getInitTerm.d.ts +7 -4
- package/sasjsCli/getInitTerm.js +17 -16
- package/sasjsCli/getInitTerm.js.map +1 -1
- package/sasjsCli/loadDependenciesFile.js +4 -4
- package/sasjsCli/loadDependenciesFile.js.map +1 -1
- package/utils/utils.d.ts +1 -0
- package/utils/utils.js +3 -1
- package/utils/utils.js.map +1 -1
|
@@ -113,7 +113,7 @@ var CompileTree = /** @class */ (function () {
|
|
|
113
113
|
exports.CompileTree = CompileTree;
|
|
114
114
|
// Removes header from SAS file
|
|
115
115
|
var removeHeader = function (content) {
|
|
116
|
-
return content.replace(new RegExp("
|
|
116
|
+
return content.replace(new RegExp("\\/(\\*){1,2}([\\s\\S]*?)(\\*){1,2}\\/"), '');
|
|
117
117
|
};
|
|
118
118
|
exports.removeHeader = removeHeader;
|
|
119
119
|
//# sourceMappingURL=compileTree.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compileTree.js","sourceRoot":"","sources":["../../src/compileTree/compileTree.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuB;AACvB,yBAA0C;AAC1C,wCAA4E;
|
|
1
|
+
{"version":3,"file":"compileTree.js","sourceRoot":"","sources":["../../src/compileTree/compileTree.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuB;AACvB,yBAA0C;AAC1C,wCAA4E;AAa5E;IAIE,qBAAY,QAAgB,EAAE,IAAe;QAAf,qBAAA,EAAA,SAAe;QAC3C,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAA;QACzB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;IACnB,CAAC;IAGD,sBAAI,6BAAI;QADR,sBAAsB;aACtB;YACE,OAAO,IAAI,CAAC,KAAK,CAAA;QACnB,CAAC;;;OAAA;IAED,oBAAoB;IACb,6BAAO,GAAd,UAAe,QAAgB;QAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC/C,CAAC;IAED,YAAY;IACL,6BAAO,GAAd,UAAe,IAAU;QACvB,IAAI,CAAC,YAAY,GAAG,IAAA,kBAAO,EACzB,IAAA,8BAAmB,EAAC,IAAI,CAAC,OAAO,EAAE,2BAAgB,CAAC,KAAK,CAAC,EACzD,IAAI,CAAC,OAAO,CACb,CAAA;QACD,IAAI,CAAC,OAAO,GAAG,IAAA,oBAAY,EAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAEzC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,IAAI,CAAA;QAElD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,kCAAkC;IACrB,8BAAQ,GAArB;;;;4BACE,qBAAM,IAAA,cAAU,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAA;;wBAArE,SAAqE,CAAA;;;;;KACtE;IAED,wCAAwC;IACxC,yDAAyD;IAC5C,mCAAa,GAA1B,UAA2B,OAAe;;;;;;;wBAClC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;wBAElC,IAAI,IAAI;4BAAE,sBAAO,IAAI,CAAC,OAAO,EAAA;wBAEtB,KAAA,IAAI,CAAC,OAAO,CAAA;;wBACR,qBAAM,IAAA,YAAQ,EAAC,OAAO,EAAE,SAAS,CAAC,EAAA;4BAD7C,sBAAO,SAAA,IAAI,IACT,UAAO,GAAE,SAAkC;gCAC3C,eAAY,GAAE,EAAE;gCAChB,WAAQ,GAAE,OAAO;qCACjB,CAAC,OAAO,EAAA;;;;KACX;IAED,uCAAuC;IAC/B,iCAAW,GAAnB,UAAoB,QAAgB;QAClC,OAAO,QAAQ,CAAC,KAAK,CAAC,cAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IACtE,CAAC;IACH,kBAAC;AAAD,CAAC,AAvDD,IAuDC;AAvDY,kCAAW;AAyDxB,+BAA+B;AACxB,IAAM,YAAY,GAAG,UAAC,OAAe;IAC1C,OAAA,OAAO,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,wCAAwC,CAAC,EAAE,EAAE,CAAC;AAAzE,CAAyE,CAAA;AAD9D,QAAA,YAAY,gBACkD"}
|
package/formatter/index.d.ts
CHANGED
package/formatter/index.js
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.capitalizeFirstChar = exports.sanitizeSpecialChars = exports.padWithNumber = void 0;
|
|
3
|
+
exports.newLine = exports.capitalizeFirstChar = exports.sanitizeSpecialChars = exports.padWithNumber = void 0;
|
|
4
4
|
var number_1 = require("./number");
|
|
5
5
|
Object.defineProperty(exports, "padWithNumber", { enumerable: true, get: function () { return number_1.padWithNumber; } });
|
|
6
6
|
var string_1 = require("./string");
|
|
7
7
|
Object.defineProperty(exports, "sanitizeSpecialChars", { enumerable: true, get: function () { return string_1.sanitizeSpecialChars; } });
|
|
8
8
|
Object.defineProperty(exports, "capitalizeFirstChar", { enumerable: true, get: function () { return string_1.capitalizeFirstChar; } });
|
|
9
|
+
var regexp_1 = require("./regexp");
|
|
10
|
+
Object.defineProperty(exports, "newLine", { enumerable: true, get: function () { return regexp_1.newLine; } });
|
|
9
11
|
//# sourceMappingURL=index.js.map
|
package/formatter/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/formatter/index.ts"],"names":[],"mappings":";;;AAAA,mCAAwC;AAA/B,uGAAA,aAAa,OAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/formatter/index.ts"],"names":[],"mappings":";;;AAAA,mCAAwC;AAA/B,uGAAA,aAAa,OAAA;AACtB,mCAAoE;AAA3D,8GAAA,oBAAoB,OAAA;AAAE,6GAAA,mBAAmB,OAAA;AAClD,mCAAkC;AAAzB,iGAAA,OAAO,OAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const newLine: () => "\\r\\n" | "\\n";
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// FIXME: if isWindows is used, it breaks cli.spec.ts because Logger is undefined
|
|
3
|
+
// import { isWindows } from '../'
|
|
4
|
+
// export const newLine = () => (isWindows() ? '\\r\\n' : '\\n')
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.newLine = void 0;
|
|
7
|
+
var newLine = function () { return (process.platform === 'win32' ? '\\r\\n' : '\\n'); };
|
|
8
|
+
exports.newLine = newLine;
|
|
9
|
+
//# sourceMappingURL=regexp.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"regexp.js","sourceRoot":"","sources":["../../src/formatter/regexp.ts"],"names":[],"mappings":";AAAA,iFAAiF;AACjF,kCAAkC;AAClC,gEAAgE;;;AAEzD,IAAM,OAAO,GAAG,cAAM,OAAA,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,EAAjD,CAAiD,CAAA;AAAjE,QAAA,OAAO,WAA0D"}
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Configuration, SASJsFileType, Target } from '../types';
|
|
2
|
-
import { CompileTree } from '../compileTree';
|
|
2
|
+
import { CompileTree, Leaf } from '../compileTree';
|
|
3
3
|
export declare enum ProgramType {
|
|
4
4
|
Init = "init",
|
|
5
5
|
Term = "term"
|
|
@@ -9,7 +9,7 @@ interface getInitTermParams {
|
|
|
9
9
|
target?: Target;
|
|
10
10
|
fileType: SASJsFileType;
|
|
11
11
|
buildSourceFolder: string;
|
|
12
|
-
compileTree
|
|
12
|
+
compileTree: CompileTree;
|
|
13
13
|
}
|
|
14
14
|
export declare const getInitTerm: ({ configuration, target, fileType, buildSourceFolder, compileTree }: getInitTermParams) => Promise<{
|
|
15
15
|
init: string;
|
|
@@ -17,12 +17,15 @@ export declare const getInitTerm: ({ configuration, target, fileType, buildSourc
|
|
|
17
17
|
term: string;
|
|
18
18
|
termPath: string;
|
|
19
19
|
startUpVars: string;
|
|
20
|
+
initLeaf: Leaf | undefined;
|
|
21
|
+
termLeaf: Leaf | undefined;
|
|
20
22
|
}>;
|
|
21
|
-
export declare const getProgram: ({ target, configuration, buildSourceFolder, fileType }: getInitTermParams, programType: ProgramType, compileTree
|
|
23
|
+
export declare const getProgram: ({ target, configuration, buildSourceFolder, fileType }: getInitTermParams, programType: ProgramType, compileTree: CompileTree) => Promise<{
|
|
22
24
|
content: string;
|
|
23
25
|
filePath: string;
|
|
26
|
+
compileTreeLeaf?: Leaf | undefined;
|
|
24
27
|
}>;
|
|
25
28
|
export declare const mockGetProgram: (module: {
|
|
26
|
-
getProgram: (param: getInitTermParams, programType: ProgramType) => {};
|
|
29
|
+
getProgram: (param: getInitTermParams, programType: ProgramType, compileTree: CompileTree) => {};
|
|
27
30
|
}, fakeInit: string, fakeTerm: string) => void;
|
|
28
31
|
export {};
|
package/sasjsCli/getInitTerm.js
CHANGED
|
@@ -87,32 +87,36 @@ var ProgramType;
|
|
|
87
87
|
var getInitTerm = function (_a) {
|
|
88
88
|
var configuration = _a.configuration, target = _a.target, fileType = _a.fileType, buildSourceFolder = _a.buildSourceFolder, compileTree = _a.compileTree;
|
|
89
89
|
return __awaiter(void 0, void 0, void 0, function () {
|
|
90
|
-
var _b, init, initPath, _c, term, termPath, startUpVars;
|
|
90
|
+
var _b, init, initPath, initLeaf, _c, term, termPath, termLeaf, startUpVars;
|
|
91
91
|
return __generator(this, function (_d) {
|
|
92
92
|
switch (_d.label) {
|
|
93
93
|
case 0: return [4 /*yield*/, (0, exports.getProgram)({
|
|
94
94
|
target: target,
|
|
95
95
|
configuration: configuration,
|
|
96
96
|
buildSourceFolder: buildSourceFolder,
|
|
97
|
-
fileType: fileType
|
|
97
|
+
fileType: fileType,
|
|
98
|
+
compileTree: compileTree
|
|
98
99
|
}, ProgramType.Init, compileTree)];
|
|
99
100
|
case 1:
|
|
100
|
-
_b = _d.sent(), init = _b.content, initPath = _b.filePath;
|
|
101
|
+
_b = _d.sent(), init = _b.content, initPath = _b.filePath, initLeaf = _b.compileTreeLeaf;
|
|
101
102
|
return [4 /*yield*/, (0, exports.getProgram)({
|
|
102
103
|
target: target,
|
|
103
104
|
configuration: configuration,
|
|
104
105
|
buildSourceFolder: buildSourceFolder,
|
|
105
|
-
fileType: fileType
|
|
106
|
+
fileType: fileType,
|
|
107
|
+
compileTree: compileTree
|
|
106
108
|
}, ProgramType.Term, compileTree)];
|
|
107
109
|
case 2:
|
|
108
|
-
_c = _d.sent(), term = _c.content, termPath = _c.filePath;
|
|
110
|
+
_c = _d.sent(), term = _c.content, termPath = _c.filePath, termLeaf = _c.compileTreeLeaf;
|
|
109
111
|
startUpVars = getVars(fileType, target, configuration);
|
|
110
112
|
return [2 /*return*/, {
|
|
111
113
|
init: init,
|
|
112
114
|
initPath: initPath,
|
|
113
115
|
term: term,
|
|
114
116
|
termPath: termPath,
|
|
115
|
-
startUpVars: startUpVars
|
|
117
|
+
startUpVars: startUpVars,
|
|
118
|
+
initLeaf: initLeaf,
|
|
119
|
+
termLeaf: termLeaf
|
|
116
120
|
}];
|
|
117
121
|
}
|
|
118
122
|
});
|
|
@@ -158,7 +162,7 @@ var convertVarsToSasFormat = function (vars) {
|
|
|
158
162
|
var getProgram = function (_a, programType, compileTree) {
|
|
159
163
|
var target = _a.target, configuration = _a.configuration, buildSourceFolder = _a.buildSourceFolder, fileType = _a.fileType;
|
|
160
164
|
return __awaiter(void 0, void 0, void 0, function () {
|
|
161
|
-
var programContent, filePath, program, targetConfig, rootConfig, content;
|
|
165
|
+
var programContent, filePath, program, targetConfig, rootConfig, content, compileTreeLeaf;
|
|
162
166
|
return __generator(this, function (_b) {
|
|
163
167
|
switch (_b.label) {
|
|
164
168
|
case 0:
|
|
@@ -185,24 +189,21 @@ var getProgram = function (_a, programType, compileTree) {
|
|
|
185
189
|
targetConfig["".concat(programType, "Program")]) ||
|
|
186
190
|
(rootConfig &&
|
|
187
191
|
rootConfig["".concat(programType, "Program")]);
|
|
188
|
-
if (!program) return [3 /*break*/,
|
|
192
|
+
if (!program) return [3 /*break*/, 2];
|
|
189
193
|
filePath = (0, file_1.getAbsolutePath)(program, buildSourceFolder);
|
|
190
|
-
if (!(compileTree && Object.keys(compileTree).length)) return [3 /*break*/, 2];
|
|
191
194
|
return [4 /*yield*/, compileTree.getDepContent(filePath)];
|
|
192
195
|
case 1:
|
|
193
196
|
programContent = _b.sent();
|
|
194
|
-
|
|
195
|
-
case 2:
|
|
196
|
-
case 3:
|
|
197
|
-
programContent = _b.sent();
|
|
198
|
-
_b.label = 4;
|
|
199
|
-
case 4:
|
|
197
|
+
_b.label = 2;
|
|
198
|
+
case 2:
|
|
200
199
|
content = programContent
|
|
201
200
|
? "\n* ".concat(fileType).concat((0, formatter_1.capitalizeFirstChar)(programType), " start;\n").concat(programContent, "\n* ").concat(fileType).concat((0, formatter_1.capitalizeFirstChar)(programType), " end;")
|
|
202
201
|
: '';
|
|
202
|
+
compileTreeLeaf = compileTree.getLeaf(filePath);
|
|
203
203
|
return [2 /*return*/, {
|
|
204
204
|
content: content,
|
|
205
|
-
filePath: filePath
|
|
205
|
+
filePath: filePath,
|
|
206
|
+
compileTreeLeaf: compileTreeLeaf
|
|
206
207
|
}];
|
|
207
208
|
}
|
|
208
209
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getInitTerm.js","sourceRoot":"","sources":["../../src/sasjsCli/getInitTerm.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"getInitTerm.js","sourceRoot":"","sources":["../../src/sasjsCli/getInitTerm.ts"],"names":[],"mappings":"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"}
|
|
@@ -68,7 +68,7 @@ var _1 = require("./");
|
|
|
68
68
|
var loadDependenciesFile = function (_a) {
|
|
69
69
|
var filePath = _a.filePath, fileContent = _a.fileContent, configuration = _a.configuration, target = _a.target, type = _a.type, programFolders = _a.programFolders, macroFolders = _a.macroFolders, buildSourceFolder = _a.buildSourceFolder, macroCorePath = _a.macroCorePath, binaryFolders = _a.binaryFolders, compileTree = _a.compileTree;
|
|
70
70
|
return __awaiter(void 0, void 0, void 0, function () {
|
|
71
|
-
var _b, init, initPath, term, termPath, startUpVars, fileDependencyPaths, initDependencyPaths, termDependencyPaths, allDependencyPaths, initProgramDependencies, termProgramDependencies, programDependencies, binariesDeps, dependenciesContent;
|
|
71
|
+
var _b, init, initPath, term, termPath, startUpVars, initLeaf, termLeaf, fileDependencyPaths, initDependencyPaths, termDependencyPaths, allDependencyPaths, initProgramDependencies, termProgramDependencies, programDependencies, binariesDeps, dependenciesContent;
|
|
72
72
|
return __generator(this, function (_c) {
|
|
73
73
|
switch (_c.label) {
|
|
74
74
|
case 0: return [4 /*yield*/, (0, _1.getInitTerm)({
|
|
@@ -79,15 +79,15 @@ var loadDependenciesFile = function (_a) {
|
|
|
79
79
|
compileTree: compileTree
|
|
80
80
|
})];
|
|
81
81
|
case 1:
|
|
82
|
-
_b = _c.sent(), init = _b.init, initPath = _b.initPath, term = _b.term, termPath = _b.termPath, startUpVars = _b.startUpVars;
|
|
82
|
+
_b = _c.sent(), init = _b.init, initPath = _b.initPath, term = _b.term, termPath = _b.termPath, startUpVars = _b.startUpVars, initLeaf = _b.initLeaf, termLeaf = _b.termLeaf;
|
|
83
83
|
fileContent = "\n* ".concat(type, " start;\n").concat(fileContent, "\n* ").concat(type, " end;");
|
|
84
84
|
return [4 /*yield*/, (0, _1.getDependencyPaths)("".concat(fileContent, "\n").concat(init, "\n").concat(term), macroFolders, macroCorePath, compileTree)];
|
|
85
85
|
case 2:
|
|
86
86
|
fileDependencyPaths = _c.sent();
|
|
87
|
-
return [4 /*yield*/, (0, _1.getDependencyPaths)(init, macroFolders, macroCorePath, compileTree)];
|
|
87
|
+
return [4 /*yield*/, (0, _1.getDependencyPaths)(init, macroFolders, macroCorePath, compileTree, initLeaf)];
|
|
88
88
|
case 3:
|
|
89
89
|
initDependencyPaths = _c.sent();
|
|
90
|
-
return [4 /*yield*/, (0, _1.getDependencyPaths)(term, macroFolders, macroCorePath, compileTree)];
|
|
90
|
+
return [4 /*yield*/, (0, _1.getDependencyPaths)(term, macroFolders, macroCorePath, compileTree, termLeaf)];
|
|
91
91
|
case 4:
|
|
92
92
|
termDependencyPaths = _c.sent();
|
|
93
93
|
allDependencyPaths = __spreadArray(__spreadArray(__spreadArray([], __read(initDependencyPaths), false), __read(fileDependencyPaths), false), __read(termDependencyPaths), false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadDependenciesFile.js","sourceRoot":"","sources":["../../src/sasjsCli/loadDependenciesFile.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gCAAkC;AAElC,kCAAuC;AACvC,uBAKW;AAiBJ,IAAM,oBAAoB,GAAG,UAAO,EAYlB;QAXvB,QAAQ,cAAA,EACR,WAAW,iBAAA,EACX,aAAa,mBAAA,EACb,MAAM,YAAA,EACN,IAAI,UAAA,EACJ,cAAc,oBAAA,EACd,YAAY,kBAAA,EACZ,iBAAiB,uBAAA,EACjB,aAAa,mBAAA,EACb,aAAa,mBAAA,EACb,WAAW,iBAAA;;;;;
|
|
1
|
+
{"version":3,"file":"loadDependenciesFile.js","sourceRoot":"","sources":["../../src/sasjsCli/loadDependenciesFile.ts"],"names":[],"mappings":"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"}
|
package/utils/utils.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
export declare function asyncForEach(array: any[], callback: (item: any, index: number, originalArray: any[]) => any): Promise<void>;
|
|
2
2
|
export declare const uuidv4: () => string;
|
|
3
3
|
export declare const uniqArray: (data: any[]) => any[];
|
|
4
|
+
export declare const isWindows: () => boolean;
|
package/utils/utils.js
CHANGED
|
@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
36
36
|
}
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
-
exports.uniqArray = exports.uuidv4 = exports.asyncForEach = void 0;
|
|
39
|
+
exports.isWindows = exports.uniqArray = exports.uuidv4 = exports.asyncForEach = void 0;
|
|
40
40
|
function asyncForEach(array, callback) {
|
|
41
41
|
return __awaiter(this, void 0, void 0, function () {
|
|
42
42
|
var index;
|
|
@@ -69,4 +69,6 @@ var uuidv4 = function () {
|
|
|
69
69
|
exports.uuidv4 = uuidv4;
|
|
70
70
|
var uniqArray = function (data) { return Array.from(new Set(data)); };
|
|
71
71
|
exports.uniqArray = uniqArray;
|
|
72
|
+
var isWindows = function () { return process.platform === 'win32'; };
|
|
73
|
+
exports.isWindows = isWindows;
|
|
72
74
|
//# sourceMappingURL=utils.js.map
|
package/utils/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAsB,YAAY,CAChC,KAAY,EACZ,QAAiE;;;;;;oBAExD,KAAK,GAAG,CAAC;;;yBAAE,CAAA,KAAK,GAAG,KAAK,CAAC,MAAM,CAAA;oBACtC,qBAAM,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,EAAA;;oBAA1C,SAA0C,CAAA;;;oBADF,KAAK,EAAE,CAAA;;;;;;CAGlD;AAPD,oCAOC;AAEM,IAAM,MAAM,GAAG;IACpB,OAAA,sCAAsC,CAAC,OAAO,CAAC,OAAO,EAAE,UAAC,CAAC;QACxD,IAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,EAChC,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAA;QAEpC,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IACvB,CAAC,CAAC;AALF,CAKE,CAAA;AANS,QAAA,MAAM,UAMf;AAEG,IAAM,SAAS,GAAG,UAAC,IAAW,IAAK,OAAA,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,EAAzB,CAAyB,CAAA;AAAtD,QAAA,SAAS,aAA6C"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAsB,YAAY,CAChC,KAAY,EACZ,QAAiE;;;;;;oBAExD,KAAK,GAAG,CAAC;;;yBAAE,CAAA,KAAK,GAAG,KAAK,CAAC,MAAM,CAAA;oBACtC,qBAAM,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,EAAA;;oBAA1C,SAA0C,CAAA;;;oBADF,KAAK,EAAE,CAAA;;;;;;CAGlD;AAPD,oCAOC;AAEM,IAAM,MAAM,GAAG;IACpB,OAAA,sCAAsC,CAAC,OAAO,CAAC,OAAO,EAAE,UAAC,CAAC;QACxD,IAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,EAChC,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAA;QAEpC,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IACvB,CAAC,CAAC;AALF,CAKE,CAAA;AANS,QAAA,MAAM,UAMf;AAEG,IAAM,SAAS,GAAG,UAAC,IAAW,IAAK,OAAA,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,EAAzB,CAAyB,CAAA;AAAtD,QAAA,SAAS,aAA6C;AAE5D,IAAM,SAAS,GAAG,cAAM,OAAA,OAAO,CAAC,QAAQ,KAAK,OAAO,EAA5B,CAA4B,CAAA;AAA9C,QAAA,SAAS,aAAqC"}
|