zshy 0.7.2 → 0.8.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/README.md +28 -0
- package/dist/compile.cjs +126 -1
- package/dist/compile.cjs.map +1 -1
- package/dist/compile.d.cts +1 -0
- package/dist/compile.d.cts.map +1 -1
- package/dist/compile.d.ts +1 -0
- package/dist/compile.d.ts.map +1 -1
- package/dist/compile.js +126 -1
- package/dist/compile.js.map +1 -1
- package/dist/main.cjs +4 -0
- package/dist/main.cjs.map +1 -1
- package/dist/main.d.cts.map +1 -1
- package/dist/main.d.ts.map +1 -1
- package/dist/main.js +4 -0
- package/dist/main.js.map +1 -1
- package/dist/tx-analyze-exports.cjs +39 -8
- package/dist/tx-analyze-exports.cjs.map +1 -1
- package/dist/tx-analyze-exports.d.cts +1 -0
- package/dist/tx-analyze-exports.d.cts.map +1 -1
- package/dist/tx-analyze-exports.d.ts +1 -0
- package/dist/tx-analyze-exports.d.ts.map +1 -1
- package/dist/tx-analyze-exports.js +39 -8
- package/dist/tx-analyze-exports.js.map +1 -1
- package/dist/tx-cjs-interop-declaration.cjs +2 -3
- package/dist/tx-cjs-interop-declaration.cjs.map +1 -1
- package/dist/tx-cjs-interop-declaration.d.cts.map +1 -1
- package/dist/tx-cjs-interop-declaration.d.ts.map +1 -1
- package/dist/tx-cjs-interop-declaration.js +2 -3
- package/dist/tx-cjs-interop-declaration.js.map +1 -1
- package/dist/tx-cjs-interop.cjs +91 -3
- package/dist/tx-cjs-interop.cjs.map +1 -1
- package/dist/tx-cjs-interop.d.cts.map +1 -1
- package/dist/tx-cjs-interop.d.ts.map +1 -1
- package/dist/tx-cjs-interop.js +91 -3
- package/dist/tx-cjs-interop.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tx-cjs-interop-declaration.js","sourceRoot":"","sources":["../src/tx-cjs-interop-declaration.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAiC;AACjC,oEAAyD;AAElD,MAAM,sCAAsC,GACjD,GAAqD,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE;IAClE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAE5B,OAAO,CAAC,UAAU,EAAE,EAAE;QACpB,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC;YAAE,OAAO,UAAU,CAAC;QAEpD,MAAM,EAAE,iBAAiB,EAAE,eAAe,EAAE,GAAG,IAAA,sCAAc,EAAC,UAAU,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"tx-cjs-interop-declaration.js","sourceRoot":"","sources":["../src/tx-cjs-interop-declaration.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tx-cjs-interop-declaration.d.ts","sourceRoot":"","sources":["../src/tx-cjs-interop-declaration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAGjC,eAAO,MAAM,sCAAsC,QAC7C,EAAE,CAAC,kBAAkB,CAAC,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"tx-cjs-interop-declaration.d.ts","sourceRoot":"","sources":["../src/tx-cjs-interop-declaration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAGjC,eAAO,MAAM,sCAAsC,QAC7C,EAAE,CAAC,kBAAkB,CAAC,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC,MAAM,CA0GlD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tx-cjs-interop-declaration.d.ts","sourceRoot":"","sources":["../src/tx-cjs-interop-declaration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAGjC,eAAO,MAAM,sCAAsC,QAC7C,EAAE,CAAC,kBAAkB,CAAC,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"tx-cjs-interop-declaration.d.ts","sourceRoot":"","sources":["../src/tx-cjs-interop-declaration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAGjC,eAAO,MAAM,sCAAsC,QAC7C,EAAE,CAAC,kBAAkB,CAAC,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC,MAAM,CA0GlD,CAAC"}
|
|
@@ -5,9 +5,8 @@ export const createCjsInteropDeclarationTransformer = () => (context) => {
|
|
|
5
5
|
return (sourceFile) => {
|
|
6
6
|
if (!ts.isSourceFile(sourceFile))
|
|
7
7
|
return sourceFile;
|
|
8
|
-
const { defaultExportNode, hasNamedExports } = analyzeExports(sourceFile);
|
|
9
|
-
|
|
10
|
-
if (!defaultExportNode || hasNamedExports) {
|
|
8
|
+
const { defaultExportNode, hasNamedExports, hasTypeOnlyExports } = analyzeExports(sourceFile);
|
|
9
|
+
if (!defaultExportNode || hasNamedExports || hasTypeOnlyExports) {
|
|
11
10
|
return sourceFile;
|
|
12
11
|
}
|
|
13
12
|
const outStmts = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tx-cjs-interop-declaration.js","sourceRoot":"","sources":["../src/tx-cjs-interop-declaration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,gCAAgC;AAEzD,MAAM,CAAC,MAAM,sCAAsC,GACjD,GAAqD,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE;IAClE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAE5B,OAAO,CAAC,UAAU,EAAE,EAAE;QACpB,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC;YAAE,OAAO,UAAU,CAAC;QAEpD,MAAM,EAAE,iBAAiB,EAAE,eAAe,EAAE,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"tx-cjs-interop-declaration.js","sourceRoot":"","sources":["../src/tx-cjs-interop-declaration.ts"],"names":[],"mappings":"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"}
|
package/dist/tx-cjs-interop.cjs
CHANGED
|
@@ -36,13 +36,101 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
36
36
|
exports.createCjsInteropTransformer = void 0;
|
|
37
37
|
const ts = __importStar(require("typescript"));
|
|
38
38
|
const tx_analyze_exports_js_1 = require("./tx-analyze-exports.cjs");
|
|
39
|
+
function hasModifier(node, kind) {
|
|
40
|
+
return ts.canHaveModifiers(node) && (ts.getModifiers(node)?.some((modifier) => modifier.kind === kind) ?? false);
|
|
41
|
+
}
|
|
42
|
+
function bindingNameContains(name, text) {
|
|
43
|
+
if (ts.isIdentifier(name)) {
|
|
44
|
+
return name.text === text;
|
|
45
|
+
}
|
|
46
|
+
return name.elements.some((element) => !ts.isOmittedExpression(element) && bindingNameContains(element.name, text));
|
|
47
|
+
}
|
|
48
|
+
function importClauseContainsRuntimeName(importClause, text) {
|
|
49
|
+
if (!importClause || importClause.isTypeOnly) {
|
|
50
|
+
return false;
|
|
51
|
+
}
|
|
52
|
+
if (importClause.name?.text === text) {
|
|
53
|
+
return true;
|
|
54
|
+
}
|
|
55
|
+
const namedBindings = importClause.namedBindings;
|
|
56
|
+
if (!namedBindings) {
|
|
57
|
+
return false;
|
|
58
|
+
}
|
|
59
|
+
if (ts.isNamespaceImport(namedBindings)) {
|
|
60
|
+
return namedBindings.name.text === text;
|
|
61
|
+
}
|
|
62
|
+
return namedBindings.elements.some((element) => !element.isTypeOnly && element.name.text === text);
|
|
63
|
+
}
|
|
64
|
+
function importClauseContainsTypeOnlyName(importClause, text) {
|
|
65
|
+
if (!importClause) {
|
|
66
|
+
return false;
|
|
67
|
+
}
|
|
68
|
+
if (importClause.isTypeOnly) {
|
|
69
|
+
if (importClause.name?.text === text) {
|
|
70
|
+
return true;
|
|
71
|
+
}
|
|
72
|
+
const namedBindings = importClause.namedBindings;
|
|
73
|
+
if (namedBindings && ts.isNamespaceImport(namedBindings)) {
|
|
74
|
+
return namedBindings.name.text === text;
|
|
75
|
+
}
|
|
76
|
+
if (namedBindings && ts.isNamedImports(namedBindings)) {
|
|
77
|
+
return namedBindings.elements.some((element) => element.name.text === text);
|
|
78
|
+
}
|
|
79
|
+
return false;
|
|
80
|
+
}
|
|
81
|
+
const namedBindings = importClause.namedBindings;
|
|
82
|
+
return (namedBindings != null &&
|
|
83
|
+
ts.isNamedImports(namedBindings) &&
|
|
84
|
+
namedBindings.elements.some((element) => element.isTypeOnly && element.name.text === text));
|
|
85
|
+
}
|
|
86
|
+
function declaresRuntimeValue(stmt, text) {
|
|
87
|
+
if (hasModifier(stmt, ts.SyntaxKind.DeclareKeyword)) {
|
|
88
|
+
return false;
|
|
89
|
+
}
|
|
90
|
+
if (ts.isFunctionDeclaration(stmt) || ts.isClassDeclaration(stmt)) {
|
|
91
|
+
return stmt.name?.text === text;
|
|
92
|
+
}
|
|
93
|
+
if (ts.isEnumDeclaration(stmt)) {
|
|
94
|
+
const isConstEnum = hasModifier(stmt, ts.SyntaxKind.ConstKeyword);
|
|
95
|
+
return stmt.name.text === text && !isConstEnum;
|
|
96
|
+
}
|
|
97
|
+
if (ts.isVariableStatement(stmt)) {
|
|
98
|
+
return stmt.declarationList.declarations.some((declaration) => bindingNameContains(declaration.name, text));
|
|
99
|
+
}
|
|
100
|
+
if (ts.isImportDeclaration(stmt)) {
|
|
101
|
+
return importClauseContainsRuntimeName(stmt.importClause, text);
|
|
102
|
+
}
|
|
103
|
+
return false;
|
|
104
|
+
}
|
|
105
|
+
function declaresTypeOnlyName(stmt, text) {
|
|
106
|
+
if (ts.isTypeAliasDeclaration(stmt) || ts.isInterfaceDeclaration(stmt)) {
|
|
107
|
+
return stmt.name.text === text;
|
|
108
|
+
}
|
|
109
|
+
if (ts.isImportDeclaration(stmt)) {
|
|
110
|
+
return importClauseContainsTypeOnlyName(stmt.importClause, text);
|
|
111
|
+
}
|
|
112
|
+
return false;
|
|
113
|
+
}
|
|
114
|
+
function isTypeOnlyDefault(node, sourceFile) {
|
|
115
|
+
if (ts.isInterfaceDeclaration(node) || ts.isTypeAliasDeclaration(node)) {
|
|
116
|
+
return true;
|
|
117
|
+
}
|
|
118
|
+
// `export default Foo` where Foo is an identifier: skip interop only if Foo has no runtime declaration.
|
|
119
|
+
if (ts.isExportAssignment(node) && !node.isExportEquals && ts.isIdentifier(node.expression)) {
|
|
120
|
+
const name = node.expression.text;
|
|
121
|
+
const hasRuntimeDeclaration = sourceFile.statements.some((stmt) => declaresRuntimeValue(stmt, name));
|
|
122
|
+
const hasTypeOnlyDeclaration = sourceFile.statements.some((stmt) => declaresTypeOnlyName(stmt, name));
|
|
123
|
+
return hasTypeOnlyDeclaration && !hasRuntimeDeclaration;
|
|
124
|
+
}
|
|
125
|
+
return false;
|
|
126
|
+
}
|
|
39
127
|
const createCjsInteropTransformer = () => (context) => {
|
|
40
128
|
return (sourceFile) => {
|
|
41
129
|
if (!ts.isSourceFile(sourceFile))
|
|
42
130
|
return sourceFile;
|
|
43
|
-
const { defaultExportNode, hasNamedExports } = (0, tx_analyze_exports_js_1.analyzeExports)(sourceFile);
|
|
44
|
-
|
|
45
|
-
const shouldApplyInterop = defaultExportNode && !hasNamedExports;
|
|
131
|
+
const { defaultExportNode, hasNamedExports, hasTypeOnlyExports } = (0, tx_analyze_exports_js_1.analyzeExports)(sourceFile);
|
|
132
|
+
const isDefaultTypeOnly = defaultExportNode != null && isTypeOnlyDefault(defaultExportNode, sourceFile);
|
|
133
|
+
const shouldApplyInterop = defaultExportNode && !hasNamedExports && !hasTypeOnlyExports && !isDefaultTypeOnly;
|
|
46
134
|
if (!shouldApplyInterop) {
|
|
47
135
|
return sourceFile;
|
|
48
136
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tx-cjs-interop.js","sourceRoot":"","sources":["../src/tx-cjs-interop.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAiC;AACjC,oEAAyD;
|
|
1
|
+
{"version":3,"file":"tx-cjs-interop.js","sourceRoot":"","sources":["../src/tx-cjs-interop.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tx-cjs-interop.d.ts","sourceRoot":"","sources":["../src/tx-cjs-interop.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"tx-cjs-interop.d.ts","sourceRoot":"","sources":["../src/tx-cjs-interop.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAsGjC,eAAO,MAAM,2BAA2B,QAAO,EAAE,CAAC,kBAAkB,CAAC,EAAE,CAAC,UAAU,CAkDjF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tx-cjs-interop.d.ts","sourceRoot":"","sources":["../src/tx-cjs-interop.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"tx-cjs-interop.d.ts","sourceRoot":"","sources":["../src/tx-cjs-interop.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAsGjC,eAAO,MAAM,2BAA2B,QAAO,EAAE,CAAC,kBAAkB,CAAC,EAAE,CAAC,UAAU,CAkDjF,CAAC"}
|
package/dist/tx-cjs-interop.js
CHANGED
|
@@ -1,12 +1,100 @@
|
|
|
1
1
|
import * as ts from "typescript";
|
|
2
2
|
import { analyzeExports } from "./tx-analyze-exports.js";
|
|
3
|
+
function hasModifier(node, kind) {
|
|
4
|
+
return ts.canHaveModifiers(node) && (ts.getModifiers(node)?.some((modifier) => modifier.kind === kind) ?? false);
|
|
5
|
+
}
|
|
6
|
+
function bindingNameContains(name, text) {
|
|
7
|
+
if (ts.isIdentifier(name)) {
|
|
8
|
+
return name.text === text;
|
|
9
|
+
}
|
|
10
|
+
return name.elements.some((element) => !ts.isOmittedExpression(element) && bindingNameContains(element.name, text));
|
|
11
|
+
}
|
|
12
|
+
function importClauseContainsRuntimeName(importClause, text) {
|
|
13
|
+
if (!importClause || importClause.isTypeOnly) {
|
|
14
|
+
return false;
|
|
15
|
+
}
|
|
16
|
+
if (importClause.name?.text === text) {
|
|
17
|
+
return true;
|
|
18
|
+
}
|
|
19
|
+
const namedBindings = importClause.namedBindings;
|
|
20
|
+
if (!namedBindings) {
|
|
21
|
+
return false;
|
|
22
|
+
}
|
|
23
|
+
if (ts.isNamespaceImport(namedBindings)) {
|
|
24
|
+
return namedBindings.name.text === text;
|
|
25
|
+
}
|
|
26
|
+
return namedBindings.elements.some((element) => !element.isTypeOnly && element.name.text === text);
|
|
27
|
+
}
|
|
28
|
+
function importClauseContainsTypeOnlyName(importClause, text) {
|
|
29
|
+
if (!importClause) {
|
|
30
|
+
return false;
|
|
31
|
+
}
|
|
32
|
+
if (importClause.isTypeOnly) {
|
|
33
|
+
if (importClause.name?.text === text) {
|
|
34
|
+
return true;
|
|
35
|
+
}
|
|
36
|
+
const namedBindings = importClause.namedBindings;
|
|
37
|
+
if (namedBindings && ts.isNamespaceImport(namedBindings)) {
|
|
38
|
+
return namedBindings.name.text === text;
|
|
39
|
+
}
|
|
40
|
+
if (namedBindings && ts.isNamedImports(namedBindings)) {
|
|
41
|
+
return namedBindings.elements.some((element) => element.name.text === text);
|
|
42
|
+
}
|
|
43
|
+
return false;
|
|
44
|
+
}
|
|
45
|
+
const namedBindings = importClause.namedBindings;
|
|
46
|
+
return (namedBindings != null &&
|
|
47
|
+
ts.isNamedImports(namedBindings) &&
|
|
48
|
+
namedBindings.elements.some((element) => element.isTypeOnly && element.name.text === text));
|
|
49
|
+
}
|
|
50
|
+
function declaresRuntimeValue(stmt, text) {
|
|
51
|
+
if (hasModifier(stmt, ts.SyntaxKind.DeclareKeyword)) {
|
|
52
|
+
return false;
|
|
53
|
+
}
|
|
54
|
+
if (ts.isFunctionDeclaration(stmt) || ts.isClassDeclaration(stmt)) {
|
|
55
|
+
return stmt.name?.text === text;
|
|
56
|
+
}
|
|
57
|
+
if (ts.isEnumDeclaration(stmt)) {
|
|
58
|
+
const isConstEnum = hasModifier(stmt, ts.SyntaxKind.ConstKeyword);
|
|
59
|
+
return stmt.name.text === text && !isConstEnum;
|
|
60
|
+
}
|
|
61
|
+
if (ts.isVariableStatement(stmt)) {
|
|
62
|
+
return stmt.declarationList.declarations.some((declaration) => bindingNameContains(declaration.name, text));
|
|
63
|
+
}
|
|
64
|
+
if (ts.isImportDeclaration(stmt)) {
|
|
65
|
+
return importClauseContainsRuntimeName(stmt.importClause, text);
|
|
66
|
+
}
|
|
67
|
+
return false;
|
|
68
|
+
}
|
|
69
|
+
function declaresTypeOnlyName(stmt, text) {
|
|
70
|
+
if (ts.isTypeAliasDeclaration(stmt) || ts.isInterfaceDeclaration(stmt)) {
|
|
71
|
+
return stmt.name.text === text;
|
|
72
|
+
}
|
|
73
|
+
if (ts.isImportDeclaration(stmt)) {
|
|
74
|
+
return importClauseContainsTypeOnlyName(stmt.importClause, text);
|
|
75
|
+
}
|
|
76
|
+
return false;
|
|
77
|
+
}
|
|
78
|
+
function isTypeOnlyDefault(node, sourceFile) {
|
|
79
|
+
if (ts.isInterfaceDeclaration(node) || ts.isTypeAliasDeclaration(node)) {
|
|
80
|
+
return true;
|
|
81
|
+
}
|
|
82
|
+
// `export default Foo` where Foo is an identifier: skip interop only if Foo has no runtime declaration.
|
|
83
|
+
if (ts.isExportAssignment(node) && !node.isExportEquals && ts.isIdentifier(node.expression)) {
|
|
84
|
+
const name = node.expression.text;
|
|
85
|
+
const hasRuntimeDeclaration = sourceFile.statements.some((stmt) => declaresRuntimeValue(stmt, name));
|
|
86
|
+
const hasTypeOnlyDeclaration = sourceFile.statements.some((stmt) => declaresTypeOnlyName(stmt, name));
|
|
87
|
+
return hasTypeOnlyDeclaration && !hasRuntimeDeclaration;
|
|
88
|
+
}
|
|
89
|
+
return false;
|
|
90
|
+
}
|
|
3
91
|
export const createCjsInteropTransformer = () => (context) => {
|
|
4
92
|
return (sourceFile) => {
|
|
5
93
|
if (!ts.isSourceFile(sourceFile))
|
|
6
94
|
return sourceFile;
|
|
7
|
-
const { defaultExportNode, hasNamedExports } = analyzeExports(sourceFile);
|
|
8
|
-
|
|
9
|
-
const shouldApplyInterop = defaultExportNode && !hasNamedExports;
|
|
95
|
+
const { defaultExportNode, hasNamedExports, hasTypeOnlyExports } = analyzeExports(sourceFile);
|
|
96
|
+
const isDefaultTypeOnly = defaultExportNode != null && isTypeOnlyDefault(defaultExportNode, sourceFile);
|
|
97
|
+
const shouldApplyInterop = defaultExportNode && !hasNamedExports && !hasTypeOnlyExports && !isDefaultTypeOnly;
|
|
10
98
|
if (!shouldApplyInterop) {
|
|
11
99
|
return sourceFile;
|
|
12
100
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tx-cjs-interop.js","sourceRoot":"","sources":["../src/tx-cjs-interop.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,gCAAgC;AAEzD,MAAM,CAAC,MAAM,2BAA2B,GAAG,GAAyC,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE;IACjG,OAAO,CAAC,UAAU,EAAE,EAAE;QACpB,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC;YAAE,OAAO,UAAU,CAAC;QAEpD,MAAM,EAAE,iBAAiB,EAAE,eAAe,EAAE,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"tx-cjs-interop.js","sourceRoot":"","sources":["../src/tx-cjs-interop.ts"],"names":[],"mappings":"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"}
|