@aster-cloud/aster-lang-ts 1.5.0 → 2.0.0

package/dist/test/unit/typecheck/effect-prefix-injection.test.js

@@ -17,6 +17,7 @@
 import { describe, it } from 'node:test';
 import assert from 'node:assert/strict';
 import { collectEffects } from '../../../src/typecheck/effects.js';
+import { toV2 } from '../../helpers/core-ir-v2.js';
 function baseContext() {
     return {
         datas: new Map(),
@@ -28,11 +29,11 @@ function baseContext() {
     };
 }
 function blockCalling(name) {
-    const call = {
+    const call = toV2({
         kind: 'Call',
         target: { kind: 'Name', name },
         args: [],
-    };
+    });
     return { kind: 'Block', statements: [{ kind: 'Return', expr: call }] };
 }
 describe('collectEffects 前缀注入（issue #88）', () => {

package/dist/test/unit/typecheck/effect-prefix-injection.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"effect-prefix-injection.test.js","sourceRoot":"","sources":["../../../../test/unit/typecheck/effect-prefix-injection.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"effect-prefix-injection.test.js","sourceRoot":"","sources":["../../../../test/unit/typecheck/effect-prefix-injection.test.ts"],"names":[],"mappings":"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"}

package/dist/test/unit/typecheck/function-return-inference.test.js

@@ -1,77 +1,78 @@
 import { describe, it } from 'node:test';
 import assert from 'node:assert/strict';
 import { typecheckBrowser } from '../../../src/typecheck/browser.js';
-const intType = { kind: 'TypeName', name: 'Int' };
-const inferredPlaceholderType = { kind: 'TypeName', name: 'inferred' };
+import { toV2 } from '../../helpers/core-ir-v2.js';
+const intType = toV2({ kind: 'TypeName', name: 'Int' });
+const inferredPlaceholderType = toV2({ kind: 'TypeName', name: 'inferred' });
 describe('function return inference regressions', () => {
     it('uses Data fields before first-pass inferred function signatures', () => {
-        const application = {
+        const application = toV2({
             kind: 'Data',
             name: 'Application',
-            fields: [{ name: 'intField', type: intType }]
-        };
-        const output = {
+            fields: [toV2({ name: 'intField', type: intType })]
+        });
+        const output = toV2({
             kind: 'Data',
             name: 'Output',
-            fields: [{ name: 'limit', type: intType }]
-        };
-        const determine = {
+            fields: [toV2({ name: 'limit', type: intType })]
+        });
+        const determine = toV2({
             kind: 'Func',
             name: 'determine',
             typeParams: [],
-            params: [{ name: 'app', type: { kind: 'TypeName', name: 'Application' } }],
+            params: [toV2({ name: 'app', type: toV2({ kind: 'TypeName', name: 'Application' }) })],
             ret: inferredPlaceholderType,
             effects: [],
             effectCaps: [],
             effectCapsExplicit: false,
             retTypeInferred: true,
-            body: {
+            body: toV2({
                 kind: 'Block',
                 statements: [
-                    {
+                    toV2({
                         kind: 'Return',
-                        expr: { kind: 'Name', name: 'app.intField' }
-                    }
+                        expr: toV2({ kind: 'Name', name: 'app.intField' })
+                    })
                 ]
-            }
-        };
-        const createOutput = {
+            })
+        });
+        const createOutput = toV2({
             kind: 'Func',
             name: 'createOutput',
             typeParams: [],
-            params: [{ name: 'app', type: { kind: 'TypeName', name: 'Application' } }],
-            ret: { kind: 'TypeName', name: 'Output' },
+            params: [toV2({ name: 'app', type: toV2({ kind: 'TypeName', name: 'Application' }) })],
+            ret: toV2({ kind: 'TypeName', name: 'Output' }),
             effects: [],
             effectCaps: [],
             effectCapsExplicit: false,
-            body: {
+            body: toV2({
                 kind: 'Block',
                 statements: [
-                    {
+                    toV2({
                         kind: 'Return',
-                        expr: {
+                        expr: toV2({
                             kind: 'Construct',
                             typeName: 'Output',
                             fields: [
                                 {
                                     name: 'limit',
-                                    expr: {
+                                    expr: toV2({
                                         kind: 'Call',
-                                        target: { kind: 'Name', name: 'determine' },
-                                        args: [{ kind: 'Name', name: 'app' }]
-                                    }
+                                        target: toV2({ kind: 'Name', name: 'determine' }),
+                                        args: [toV2({ kind: 'Name', name: 'app' })]
+                                    })
                                 }
                             ]
-                        }
-                    }
+                        })
+                    })
                 ]
-            }
-        };
-        const module = {
+            })
+        });
+        const module = toV2({
             kind: 'Module',
             name: 'demo.functionReturnInference',
             decls: [application, output, determine, createOutput]
-        };
+        });
         const errors = typecheckBrowser(module).filter(diagnostic => diagnostic.severity === 'error');
         assert.deepStrictEqual(errors, []);
     });

package/dist/test/unit/typecheck/function-return-inference.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"function-return-inference.test.js","sourceRoot":"","sources":["../../../../test/unit/typecheck/function-return-inference.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAGrE,MAAM,OAAO,GAAc,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;AAC7D,MAAM,uBAAuB,GAAc,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;AAElF,QAAQ,CAAC,uCAAuC,EAAE,GAAG,EAAE;IACrD,EAAE,CAAC,iEAAiE,EAAE,GAAG,EAAE;QACzE,MAAM,WAAW,GAAc;YAC7B,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,aAAa;YACnB,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;SAC9C,CAAC;QACF,MAAM,MAAM,GAAc;YACxB,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;SAC3C,CAAC;QACF,MAAM,SAAS,GAAc;YAC3B,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,WAAW;YACjB,UAAU,EAAE,EAAE;YACd,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,CAAC;YAC1E,GAAG,EAAE,uBAAuB;YAC5B,OAAO,EAAE,EAAE;YACX,UAAU,EAAE,EAAE;YACd,kBAAkB,EAAE,KAAK;YACzB,eAAe,EAAE,IAAI;YACrB,IAAI,EAAE;gBACJ,IAAI,EAAE,OAAO;gBACb,UAAU,EAAE;oBACV;wBACE,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE;qBAC7C;iBACF;aACF;SACF,CAAC;QACF,MAAM,YAAY,GAAc;YAC9B,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,cAAc;YACpB,UAAU,EAAE,EAAE;YACd,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,CAAC;YAC1E,GAAG,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE;YACzC,OAAO,EAAE,EAAE;YACX,UAAU,EAAE,EAAE;YACd,kBAAkB,EAAE,KAAK;YACzB,IAAI,EAAE;gBACJ,IAAI,EAAE,OAAO;gBACb,UAAU,EAAE;oBACV;wBACE,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE;4BACJ,IAAI,EAAE,WAAW;4BACjB,QAAQ,EAAE,QAAQ;4BAClB,MAAM,EAAE;gCACN;oCACE,IAAI,EAAE,OAAO;oCACb,IAAI,EAAE;wCACJ,IAAI,EAAE,MAAM;wCACZ,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE;wCAC3C,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;qCACtC;iCACF;6BACF;yBACF;qBACF;iBACF;aACF;SACF,CAAC;QACF,MAAM,MAAM,GAAgB;YAC1B,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,8BAA8B;YACpC,KAAK,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,CAAC;SACtD,CAAC;QAEF,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC;QAE9F,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"function-return-inference.test.js","sourceRoot":"","sources":["../../../../test/unit/typecheck/function-return-inference.test.ts"],"names":[],"mappings":"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"}

package/dist/test/unit/typecheck/pii-cross-runtime-conformance.test.js

@@ -28,6 +28,7 @@ import { typecheckBrowser } from '../../../src/typecheck/browser.js';
 import { Effect } from '../../../src/config/semantic.js';
 import { ERROR_METADATA } from '../../../src/diagnostics/error_codes.js';
 import { Core as CoreBuilder } from '../../../src/core/core_ir.js';
+import { toV2 } from '../../helpers/core-ir-v2.js';
 const IO_EFFECT = [Effect.IO];
 /**
  * PII codes 集合 —— **自动从 ERROR_METADATA 派生**。
@@ -56,10 +57,10 @@ function piiDiags(diags) {
 }
 const TEXT = () => CoreBuilder.TypeName('Text');
 const piiType = (level, category) => CoreBuilder.Pii(TEXT(), level, category);
-const piiParam = (name, level) => ({
+const piiParam = (name, level) => (toV2({
     name,
     type: piiType(level, 'email'),
-});
+}));
 function makeFunc(opts) {
     return CoreBuilder.Func(opts.name, [], opts.params, opts.ret, opts.effects ?? IO_EFFECT, CoreBuilder.Block(opts.body), [], false);
 }
@@ -127,7 +128,7 @@ describe('PII 跨运行时 conformance (ADR-0009 P0-1 / P0-R 扩展)', () => {
     it('场景 4：参数违规（L2 PII → plain Text param）', () => {
         const callee = makeFunc({
             name: 'plain_handler',
-            params: [{ name: 'data', type: TEXT() }],
+            params: [toV2({ name: 'data', type: TEXT() })],
             ret: TEXT(),
             effects: [Effect.PURE],
             body: [CoreBuilder.Return(CoreBuilder.Name('data'))],
@@ -147,7 +148,7 @@ describe('PII 跨运行时 conformance (ADR-0009 P0-1 / P0-R 扩展)', () => {
     it('场景 5：无 PII 代码不应误报', () => {
         const fn = makeFunc({
             name: 'no_pii',
-            params: [{ name: 'plain_text', type: TEXT() }],
+            params: [toV2({ name: 'plain_text', type: TEXT() })],
             ret: TEXT(),
             effects: [Effect.PURE],
             body: [CoreBuilder.Return(CoreBuilder.Name('plain_text'))],

package/dist/test/unit/typecheck/pii-cross-runtime-conformance.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"pii-cross-runtime-conformance.test.js","sourceRoot":"","sources":["../../../../test/unit/typecheck/pii-cross-runtime-conformance.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAErE,OAAO,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,IAAI,IAAI,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAGnE,MAAM,SAAS,GAAsB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAEjD;;;;;;;;;;GAUG;AACH,MAAM,SAAS,GAAwB,IAAI,GAAG,CAC5C,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC;KAC1B,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,KAAK,CAAC;KACzC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAc,CAAC,CACtC,CAAC;AAOF,SAAS,QAAQ,CAAC,KAAqC;IACrD,OAAO,KAAK;SACT,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SAClE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACX,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;QACpB,QAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,IAAI,OAAO,CAAwB;KACzD,CAAC,CAAC;SACF,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACb,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI;QACf,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC;QACtC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CACjC,CAAC;AACN,CAAC;AAED,MAAM,IAAI,GAAG,GAAc,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AAC3D,MAAM,OAAO,GAAG,CAAC,KAAyB,EAAE,QAAkC,EAAa,EAAE,CAC3F,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;AAC3C,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAE,KAAyB,EAAkB,EAAE,CAAC,CAAC;IAC7E,IAAI;IACJ,IAAI,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC;CAC9B,CAAC,CAAC;AAEH,SAAS,QAAQ,CAAC,IAMjB;IACC,OAAO,WAAW,CAAC,IAAI,CACrB,IAAI,CAAC,IAAI,EACT,EAAE,EACF,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,GAAG,EACR,IAAI,CAAC,OAAO,IAAI,SAAS,EACzB,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAC5B,EAAE,EACF,KAAK,CACN,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CACxB,MAAmB,EACnB,mBAA4B,EAC5B,OAAe;IAEf,MAAM,SAAS,GAAG,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;IACpD,MAAM,YAAY,GAAG,QAAQ,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;IAExD,IAAI,mBAAmB,EAAE,CAAC;QACxB,MAAM,CAAC,EAAE,CACP,SAAS,CAAC,MAAM,GAAG,CAAC,EACpB,IAAI,OAAO,8BAA8B,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,CACrE,CAAC;QACF,MAAM,CAAC,EAAE,CACP,YAAY,CAAC,MAAM,GAAG,CAAC,EACvB,IAAI,OAAO,gDAAgD,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,CAC1F,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,SAAS,CACd,SAAS,EACT,YAAY,EACZ,IAAI,OAAO,4BAA4B;QACrC,cAAc,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI;QAC3C,cAAc,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,CAC/C,CAAC;AACJ,CAAC;AAED,QAAQ,CAAC,gDAAgD,EAAE,GAAG,EAAE;IAC9D,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACnC,MAAM,UAAU,GAAG,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACnD,MAAM,EAAE,GAAG,QAAQ,CAAC;YAClB,IAAI,EAAE,yBAAyB;YAC/B,MAAM,EAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;YACpC,GAAG,EAAE,IAAI,EAAE;YACX,OAAO,EAAE,SAAS;YAClB,IAAI,EAAE;gBACJ,WAAW,CAAC,MAAM,CAChB,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;oBAC3C,WAAW,CAAC,MAAM,CAAC,0BAA0B,CAAC;oBAC9C,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC;iBAC7B,CAAC,CACH;aACF;SACF,CAAC,CAAC;QACH,MAAM,MAAM,GAAgB,WAAW,CAAC,MAAM,CAC5C,mCAAmC,EACnC,CAAC,UAAU,EAAE,EAAE,CAAC,CACjB,CAAC;QACF,iBAAiB,CAAC,MAAM,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACnC,MAAM,UAAU,GAAG,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACtD,MAAM,EAAE,GAAG,QAAQ,CAAC;YAClB,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACjC,GAAG,EAAE,IAAI,EAAE;YACX,OAAO,EAAE,SAAS;YAClB,IAAI,EAAE;gBACJ,WAAW,CAAC,MAAM,CAChB,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;oBAC9C,WAAW,CAAC,MAAM,CAAC,oBAAoB,CAAC;oBACxC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC;iBAC1B,CAAC,CACH;aACF;SACF,CAAC,CAAC;QACH,MAAM,MAAM,GAAgB,WAAW,CAAC,MAAM,CAC5C,iCAAiC,EACjC,CAAC,UAAU,EAAE,EAAE,CAAC,CACjB,CAAC;QACF,iBAAiB,CAAC,MAAM,EAAE,IAAI,EAAE,mBAAmB,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0BAA0B,EAAE,GAAG,EAAE;QAClC,MAAM,EAAE,GAAG,QAAQ,CAAC;YAClB,IAAI,EAAE,oBAAoB;YAC1B,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;YAC5D,GAAG,EAAE,IAAI,EAAE;YACX,OAAO,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC;YACtB,IAAI,EAAE;gBACJ,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBACvD,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACjD,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aAC9C;SACF,CAAC,CAAC;QACH,MAAM,MAAM,GAAgB,WAAW,CAAC,MAAM,CAC5C,mCAAmC,EACnC,CAAC,EAAE,CAAC,CACL,CAAC;QACF,iBAAiB,CAAC,MAAM,EAAE,IAAI,EAAE,iBAAiB,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC9C,MAAM,MAAM,GAAG,QAAQ,CAAC;YACtB,IAAI,EAAE,eAAe;YACrB,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC;YACxC,GAAG,EAAE,IAAI,EAAE;YACX,OAAO,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC;YACtB,IAAI,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;SACrD,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,QAAQ,CAAC;YACtB,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACjC,GAAG,EAAE,IAAI,EAAE;YACX,OAAO,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC;YACtB,IAAI,EAAE;gBACJ,WAAW,CAAC,MAAM,CAChB,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CACjF;aACF;SACF,CAAC,CAAC;QACH,MAAM,MAAM,GAAgB,WAAW,CAAC,MAAM,CAC5C,uCAAuC,EACvC,CAAC,MAAM,EAAE,MAAM,CAAC,CACjB,CAAC;QACF,iBAAiB,CAAC,MAAM,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE;QAC3B,MAAM,EAAE,GAAG,QAAQ,CAAC;YAClB,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC;YAC9C,GAAG,EAAE,IAAI,EAAE;YACX,OAAO,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC;YACtB,IAAI,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;SAC3D,CAAC,CAAC;QACH,MAAM,MAAM,GAAgB,WAAW,CAAC,MAAM,CAC5C,gCAAgC,EAChC,CAAC,EAAE,CAAC,CACL,CAAC;QAEF,MAAM,SAAS,GAAG,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;QACpD,MAAM,YAAY,GAAG,QAAQ,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;QAExD,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,sBAAsB,CAAC,CAAC;QAC1D,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,yBAAyB,CAAC,CAAC;QAChE,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sBAAsB,EAAE,GAAG,EAAE;QAC9B,MAAM,MAAM,GAAgB,WAAW,CAAC,MAAM,CAC5C,+BAA+B,EAC/B,EAAE,CACH,CAAC;QACF,MAAM,SAAS,GAAG,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;QACpD,MAAM,YAAY,GAAG,QAAQ,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;QACxD,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAChC,MAAM,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,sDAAsD;QACtD,6CAA6C;QAC7C,yCAAyC;QACzC,MAAM,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC;aACvD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,KAAK,CAAC;aACzC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAEtC,MAAM,CAAC,EAAE,CACP,oBAAoB,CAAC,MAAM,IAAI,CAAC,EAChC,uDAAuD,oBAAoB,CAAC,MAAM,IAAI,CACvF,CAAC;QAEF,KAAK,MAAM,QAAQ,IAAI,oBAAoB,EAAE,CAAC;YAC5C,MAAM,CAAC,EAAE,CACP,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EACvB,qCAAqC,QAAQ,EAAE,CAChD,CAAC;QACJ,CAAC;QAED,MAAM,CAAC,KAAK,CACV,SAAS,CAAC,IAAI,EACd,oBAAoB,CAAC,MAAM,EAC3B,gBAAgB,SAAS,CAAC,IAAI,qBAAqB,oBAAoB,CAAC,MAAM,YAAY,CAC3F,CAAC;QAEF,8CAA8C;QAC9C,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,mCAAmC,CAAC,CAAC;QACtE,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,mCAAmC,CAAC,CAAC;QACtE,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,gCAAgC,CAAC,CAAC;QACnE,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,mCAAmC,CAAC,CAAC;QACtE,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,+BAA+B,CAAC,CAAC;QAClE,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,mCAAmC,CAAC,CAAC;QACtE,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,kCAAkC,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"pii-cross-runtime-conformance.test.js","sourceRoot":"","sources":["../../../../test/unit/typecheck/pii-cross-runtime-conformance.test.ts"],"names":[],"mappings":"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"}