@mmapp/react-compiler 0.1.0-alpha.1 → 0.1.0-alpha.3
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/ATOM-PIPELINE.md +144 -0
- package/README.md +88 -40
- package/dist/babel/index.js +113 -6
- package/dist/babel/index.mjs +2 -2
- package/dist/chunk-3USIFFE4.mjs +2190 -0
- package/dist/chunk-45YMGEVT.mjs +186 -0
- package/dist/chunk-4FN2AISW.mjs +148 -0
- package/dist/chunk-4OPI5L7G.mjs +2593 -0
- package/dist/chunk-4RYTKOOJ.mjs +186 -0
- package/dist/chunk-5RKTOVR5.mjs +244 -0
- package/dist/chunk-5YDMOO4X.mjs +214 -0
- package/dist/chunk-64ZWEMLJ.mjs +148 -0
- package/dist/chunk-6XP4KSWQ.mjs +2190 -0
- package/dist/chunk-72QWL54I.mjs +175 -0
- package/dist/chunk-7B4TRI7C.mjs +4835 -0
- package/dist/chunk-7ZKGHTNB.mjs +4952 -0
- package/dist/chunk-CIESM3BP.mjs +33 -0
- package/dist/chunk-DE3ZGQAC.mjs +148 -0
- package/dist/chunk-DMCY3BBG.mjs +1933 -0
- package/dist/chunk-DPIK3PJS.mjs +244 -0
- package/dist/chunk-E5IVH4RE.mjs +186 -0
- package/dist/chunk-E6FZNUR5.mjs +4953 -0
- package/dist/chunk-EJRBDQDP.mjs +2607 -0
- package/dist/chunk-ELO4TXJL.mjs +186 -0
- package/dist/chunk-FKRO52XH.mjs +3446 -0
- package/dist/chunk-FL4YAKU6.mjs +4941 -0
- package/dist/chunk-FYT47UBU.mjs +5076 -0
- package/dist/chunk-GCLGPOJZ.mjs +148 -0
- package/dist/chunk-GXB4JOP7.mjs +5072 -0
- package/dist/chunk-HFXOUMTD.mjs +175 -0
- package/dist/chunk-HWIZ47US.mjs +214 -0
- package/dist/chunk-IB7MNPQL.mjs +4953 -0
- package/dist/chunk-ICSIHQCG.mjs +148 -0
- package/dist/chunk-JLA5VNQ3.mjs +186 -0
- package/dist/chunk-JQLWFCTM.mjs +214 -0
- package/dist/chunk-KFJJCQAL.mjs +148 -0
- package/dist/chunk-KJUIIEQE.mjs +186 -0
- package/dist/chunk-KNWTHRVQ.mjs +175 -0
- package/dist/chunk-KSG4XSZF.mjs +175 -0
- package/dist/chunk-LF5N6DOU.mjs +175 -0
- package/dist/chunk-LJQCM2IM.mjs +214 -0
- package/dist/chunk-NW6555WJ.mjs +186 -0
- package/dist/chunk-OMZE6VLQ.mjs +214 -0
- package/dist/chunk-P4BR7WVO.mjs +2190 -0
- package/dist/chunk-QQHVYH2X.mjs +244 -0
- package/dist/chunk-S5QLWLLT.mjs +186 -0
- package/dist/chunk-SCWGT2FY.mjs +2190 -0
- package/dist/chunk-SMKJUSB3.mjs +2190 -0
- package/dist/chunk-VCAY2KGM.mjs +175 -0
- package/dist/chunk-WECAV6QB.mjs +148 -0
- package/dist/chunk-WMKBXUCE.mjs +3228 -0
- package/dist/chunk-XAJ5BKKL.mjs +4947 -0
- package/dist/chunk-XG2X7AEA.mjs +175 -0
- package/dist/chunk-XG7Z23NQ.mjs +148 -0
- package/dist/chunk-XWZAOCQ7.mjs +2607 -0
- package/dist/chunk-Y6MA7ULW.mjs +148 -0
- package/dist/chunk-YMS7Q7LG.mjs +214 -0
- package/dist/chunk-ZA37XTGA.mjs +175 -0
- package/dist/cli/index.js +1616 -366
- package/dist/cli/index.mjs +8 -8
- package/dist/codemod/cli.mjs +1 -1
- package/dist/codemod/index.mjs +1 -1
- package/dist/dev-server-RmGHIntF.d.mts +113 -0
- package/dist/dev-server-RmGHIntF.d.ts +113 -0
- package/dist/dev-server.d.mts +1 -1
- package/dist/dev-server.d.ts +1 -1
- package/dist/dev-server.js +982 -53
- package/dist/dev-server.mjs +5 -5
- package/dist/envelope.js +113 -6
- package/dist/envelope.mjs +3 -3
- package/dist/index.d.mts +5 -1
- package/dist/index.d.ts +5 -1
- package/dist/index.js +992 -63
- package/dist/index.mjs +8 -8
- package/{src/cli/init.ts → dist/init-7JQMAAXS.mjs} +70 -95
- package/dist/init-EHO4VQ22.mjs +369 -0
- package/dist/init-UC3FWPIW.mjs +367 -0
- package/dist/init-UNSMVKIK.mjs +366 -0
- package/dist/init-UNV5XIDE.mjs +367 -0
- package/dist/project-compiler-2P4N4DR7.mjs +10 -0
- package/dist/project-compiler-D2LCC27O.mjs +10 -0
- package/dist/project-compiler-EJ3GANJE.mjs +10 -0
- package/dist/project-compiler-LOQKVRZJ.mjs +10 -0
- package/dist/project-compiler-RQ6OQKRM.mjs +10 -0
- package/dist/project-compiler-VWNNCHGO.mjs +10 -0
- package/dist/project-compiler-XVAAU4C5.mjs +10 -0
- package/dist/project-compiler-YES5FGMD.mjs +10 -0
- package/dist/project-compiler-ZKMQDLGU.mjs +10 -0
- package/dist/project-decompiler-FLXCEJHS.mjs +7 -0
- package/dist/project-decompiler-VLPR22QF.mjs +7 -0
- package/dist/pull-FUS5QYZS.mjs +109 -0
- package/dist/pull-LD5ENLGY.mjs +109 -0
- package/dist/testing/index.js +113 -6
- package/dist/testing/index.mjs +2 -2
- package/dist/vite/index.js +113 -6
- package/dist/vite/index.mjs +3 -3
- package/examples/uber-app/app/admin/fleet.tsx +19 -19
- package/package.json +4 -3
- package/compile-blueprint-chat.mjs +0 -99
- package/compile-blueprint-glass-console.mjs +0 -98
- package/compile-chat-defs.mjs +0 -92
- package/examples/uber-app/tests/payment.test.tsx +0 -129
- package/examples/uber-app/tests/ride-flow.test.tsx +0 -123
- package/package.json.backup +0 -86
- package/scripts/decompile.ts +0 -226
- package/scripts/seed-auth.ts +0 -267
- package/scripts/seed-uber.ts +0 -248
- package/scripts/validate-uber.ts +0 -119
- package/seed-blueprint-chat.mjs +0 -444
- package/seed-blueprint-glass-console.mjs +0 -445
- package/seed-compiled.mjs +0 -318
- package/src/RoundTripValidator.ts +0 -400
- package/src/__tests__/atom-rendering-coverage.test.ts +0 -680
- package/src/__tests__/auth-module-compilation.test.ts +0 -247
- package/src/__tests__/auth-template-compilation.test.ts +0 -589
- package/src/__tests__/change-extractor.test.ts +0 -142
- package/src/__tests__/cli-pull.test.ts +0 -73
- package/src/__tests__/cli-test.test.ts +0 -72
- package/src/__tests__/component-extractor.test.ts +0 -331
- package/src/__tests__/context-extractor.test.ts +0 -145
- package/src/__tests__/decompiler.test.ts +0 -718
- package/src/__tests__/define-blueprint.test.ts +0 -133
- package/src/__tests__/definition-validator.test.ts +0 -519
- package/src/__tests__/during-extractor.test.ts +0 -152
- package/src/__tests__/effect-extractor.test.ts +0 -107
- package/src/__tests__/event-emission.test.ts +0 -127
- package/src/__tests__/examples.test.ts +0 -236
- package/src/__tests__/full-blueprint-coverage.test.ts +0 -1221
- package/src/__tests__/golden-suite.test.ts +0 -403
- package/src/__tests__/grammar-island-extractor.test.ts +0 -289
- package/src/__tests__/instance-key.test.ts +0 -82
- package/src/__tests__/ir-migration.test.ts +0 -255
- package/src/__tests__/lock-file.test.ts +0 -117
- package/src/__tests__/model-extractor.test.ts +0 -195
- package/src/__tests__/model-field-acl.test.ts +0 -237
- package/src/__tests__/model-hooks.test.ts +0 -130
- package/src/__tests__/model-ref-resolution.test.ts +0 -268
- package/src/__tests__/model-roundtrip.test.ts +0 -502
- package/src/__tests__/model-runtime.test.ts +0 -112
- package/src/__tests__/model-transitions.test.ts +0 -183
- package/src/__tests__/nrt-action-trace.test.ts +0 -391
- package/src/__tests__/pipeline-hardening.test.ts +0 -413
- package/src/__tests__/project-compiler.test.ts +0 -546
- package/src/__tests__/project-decompiler.test.ts +0 -343
- package/src/__tests__/query-compilation.test.ts +0 -145
- package/src/__tests__/round-trip/PLAN.md +0 -158
- package/src/__tests__/round-trip/README.md +0 -52
- package/src/__tests__/round-trip/RESULTS.md +0 -86
- package/src/__tests__/round-trip/fixtures/data-heavy/main.workflow.tsx +0 -55
- package/src/__tests__/round-trip/fixtures/data-heavy/mm.config.ts +0 -11
- package/src/__tests__/round-trip/fixtures/data-heavy/models/contact.ts +0 -54
- package/src/__tests__/round-trip/fixtures/full-workflow/main.workflow.tsx +0 -79
- package/src/__tests__/round-trip/fixtures/full-workflow/mm.config.ts +0 -12
- package/src/__tests__/round-trip/fixtures/full-workflow/models/order.ts +0 -50
- package/src/__tests__/round-trip/fixtures/simple-crud/main.workflow.tsx +0 -25
- package/src/__tests__/round-trip/fixtures/simple-crud/mm.config.ts +0 -11
- package/src/__tests__/round-trip/fixtures/simple-crud/models/task.ts +0 -32
- package/src/__tests__/round-trip/fixtures/view-heavy/main.workflow.tsx +0 -79
- package/src/__tests__/round-trip/fixtures/view-heavy/mm.config.ts +0 -10
- package/src/__tests__/round-trip/round-trip.test.ts +0 -2598
- package/src/__tests__/round-trip-ir.test.ts +0 -300
- package/src/__tests__/round-trip.test.ts +0 -1212
- package/src/__tests__/route-merging.test.ts +0 -372
- package/src/__tests__/router-composition.test.ts +0 -489
- package/src/__tests__/router-extractor.test.ts +0 -176
- package/src/__tests__/server-action-extractor.test.ts +0 -128
- package/src/__tests__/smart-type-inference.test.ts +0 -365
- package/src/__tests__/source-envelope.test.ts +0 -284
- package/src/__tests__/source-fidelity.test.ts +0 -516
- package/src/__tests__/state-extractor.test.ts +0 -115
- package/src/__tests__/strict-mode.test.ts +0 -227
- package/src/__tests__/transition-effect-extractor.test.ts +0 -119
- package/src/__tests__/transition-extractor.test.ts +0 -68
- package/src/__tests__/ts-to-expression.test.ts +0 -462
- package/src/__tests__/type-generator.test.ts +0 -201
- package/src/__tests__/uber-validation.test.ts +0 -502
- package/src/action-compiler.ts +0 -361
- package/src/babel/emitters/experience-transform.ts +0 -199
- package/src/babel/emitters/ir-to-tsx-emitter.ts +0 -110
- package/src/babel/emitters/pure-form-emitter.ts +0 -1023
- package/src/babel/emitters/runtime-glue-emitter.ts +0 -39
- package/src/babel/extractors/change-extractor.ts +0 -199
- package/src/babel/extractors/component-extractor.ts +0 -907
- package/src/babel/extractors/computed-extractor.ts +0 -262
- package/src/babel/extractors/context-extractor.ts +0 -277
- package/src/babel/extractors/during-extractor.ts +0 -295
- package/src/babel/extractors/effect-extractor.ts +0 -340
- package/src/babel/extractors/event-extractor.ts +0 -235
- package/src/babel/extractors/grammar-island-extractor.ts +0 -302
- package/src/babel/extractors/model-extractor.ts +0 -1018
- package/src/babel/extractors/router-extractor.ts +0 -303
- package/src/babel/extractors/server-action-extractor.ts +0 -173
- package/src/babel/extractors/server-action-hook-extractor.ts +0 -72
- package/src/babel/extractors/server-state-extractor.ts +0 -88
- package/src/babel/extractors/state-extractor.ts +0 -214
- package/src/babel/extractors/transition-effect-extractor.ts +0 -176
- package/src/babel/extractors/transition-extractor.ts +0 -143
- package/src/babel/index.ts +0 -24
- package/src/babel/transpilers/ts-to-expression.ts +0 -674
- package/src/babel/visitor.ts +0 -807
- package/src/cli/auth.ts +0 -255
- package/src/cli/build.ts +0 -288
- package/src/cli/deploy.ts +0 -206
- package/src/cli/index.ts +0 -328
- package/src/cli/installer.ts +0 -261
- package/src/cli/lock-file.ts +0 -94
- package/src/cli/mmrc.ts +0 -22
- package/src/cli/pull.ts +0 -172
- package/src/cli/registry-client.ts +0 -175
- package/src/cli/test.ts +0 -397
- package/src/cli/type-generator.ts +0 -243
- package/src/codemod/__tests__/forward.test.ts +0 -239
- package/src/codemod/__tests__/reverse.test.ts +0 -145
- package/src/codemod/__tests__/round-trip.test.ts +0 -137
- package/src/codemod/annotation.ts +0 -97
- package/src/codemod/classify.ts +0 -197
- package/src/codemod/cli.ts +0 -207
- package/src/codemod/control-flow.ts +0 -409
- package/src/codemod/forward.ts +0 -244
- package/src/codemod/import-manager.ts +0 -171
- package/src/codemod/index.ts +0 -120
- package/src/codemod/reverse.ts +0 -197
- package/src/codemod/rules.ts +0 -174
- package/src/codemod/state-transform.ts +0 -126
- package/src/decompiler/ast-builder.ts +0 -538
- package/src/decompiler/config-generator.ts +0 -151
- package/src/decompiler/index.ts +0 -315
- package/src/decompiler/project-decompiler.ts +0 -1776
- package/src/decompiler/project.ts +0 -862
- package/src/decompiler/split-strategy.ts +0 -140
- package/src/decompiler/state-emitter.ts +0 -1053
- package/src/decompiler/sx-emitter.ts +0 -318
- package/src/decompiler/workspace-hydrator.ts +0 -189
- package/src/dev-server.ts +0 -238
- package/src/envelope/fs-tree.ts +0 -217
- package/src/envelope/source-envelope.ts +0 -264
- package/src/envelope.ts +0 -315
- package/src/incremental-compiler.ts +0 -401
- package/src/index.ts +0 -99
- package/src/model-compiler.ts +0 -277
- package/src/project-compiler.ts +0 -1629
- package/src/route-extractor.ts +0 -333
- package/src/testing/index.ts +0 -32
- package/src/testing/snapshot.ts +0 -252
- package/src/testing/test-utils.ts +0 -226
- package/src/types.ts +0 -68
- package/src/vite/index.ts +0 -288
- package/test-compile.mjs +0 -142
- package/tsconfig.json +0 -25
- package/tsup.config.ts +0 -23
- package/vitest.config.ts +0 -9
|
@@ -1,589 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Auth Template Compilation Tests
|
|
3
|
-
*
|
|
4
|
-
* Feeds the auth add-on and auth-app template files through the project compiler
|
|
5
|
-
* to verify they compile successfully (or identify what fails and why).
|
|
6
|
-
*/
|
|
7
|
-
|
|
8
|
-
import { describe, it, expect } from 'vitest';
|
|
9
|
-
import { compileProject } from '../project-compiler';
|
|
10
|
-
import type { IRExperienceNode } from '@mindmatrix/player-core';
|
|
11
|
-
|
|
12
|
-
// =============================================================================
|
|
13
|
-
// Auth Add-on Template Strings (from project-addons/auth.ts)
|
|
14
|
-
// =============================================================================
|
|
15
|
-
|
|
16
|
-
const ADDON_LOGIN = `import { Stack, Heading, Text, TextInput, Button, Card, Link } from '@mindmatrix/react';
|
|
17
|
-
import { useAuth, useForm, useRouter } from '@mindmatrix/react';
|
|
18
|
-
|
|
19
|
-
/**
|
|
20
|
-
* Login page — email/password form using useAuth() hook.
|
|
21
|
-
*/
|
|
22
|
-
export default function LoginPage() {
|
|
23
|
-
const { login, loading, error } = useAuth();
|
|
24
|
-
const router = useRouter();
|
|
25
|
-
const form = useForm({
|
|
26
|
-
fields: {
|
|
27
|
-
email: { initial: '', required: true },
|
|
28
|
-
password: { initial: '', required: true },
|
|
29
|
-
},
|
|
30
|
-
});
|
|
31
|
-
|
|
32
|
-
const handleSubmit = async () => {
|
|
33
|
-
if (!form.isValid) return;
|
|
34
|
-
try {
|
|
35
|
-
await login({ email: form.values.email, password: form.values.password });
|
|
36
|
-
router.navigate('/');
|
|
37
|
-
} catch {
|
|
38
|
-
// error is surfaced via useAuth().error
|
|
39
|
-
}
|
|
40
|
-
};
|
|
41
|
-
|
|
42
|
-
return (
|
|
43
|
-
<Stack sx={{ minHeight: '100vh', alignItems: 'center', justifyContent: 'center', background: 'var(--muted)', padding: 24 }}>
|
|
44
|
-
<Card sx={{ maxWidth: 400, width: '100%', padding: 32 }}>
|
|
45
|
-
<Stack gap={20}>
|
|
46
|
-
<Stack gap={4} sx={{ textAlign: 'center' }}>
|
|
47
|
-
<Heading text="Sign In" level="h2" />
|
|
48
|
-
<Text text="Enter your credentials to continue" sx={{ color: 'var(--muted-foreground)', fontSize: 14 }} />
|
|
49
|
-
</Stack>
|
|
50
|
-
|
|
51
|
-
{error && (
|
|
52
|
-
<Text text={error.message} sx={{ color: 'var(--destructive)', fontSize: 13, padding: '8px 12px', background: 'var(--destructive)/10', borderRadius: 6 }} />
|
|
53
|
-
)}
|
|
54
|
-
|
|
55
|
-
<Stack gap={12}>
|
|
56
|
-
<TextInput
|
|
57
|
-
label="Email"
|
|
58
|
-
placeholder="you@example.com"
|
|
59
|
-
value={form.values.email}
|
|
60
|
-
onChange={form.register('email').onChange}
|
|
61
|
-
/>
|
|
62
|
-
<TextInput
|
|
63
|
-
label="Password"
|
|
64
|
-
placeholder="\\u2022\\u2022\\u2022\\u2022\\u2022\\u2022\\u2022\\u2022"
|
|
65
|
-
type="password"
|
|
66
|
-
value={form.values.password}
|
|
67
|
-
onChange={form.register('password').onChange}
|
|
68
|
-
/>
|
|
69
|
-
</Stack>
|
|
70
|
-
|
|
71
|
-
<Button
|
|
72
|
-
label={loading ? 'Signing in...' : 'Sign In'}
|
|
73
|
-
variant="primary"
|
|
74
|
-
onClick={handleSubmit}
|
|
75
|
-
disabled={loading || !form.isValid}
|
|
76
|
-
sx={{ width: '100%' }}
|
|
77
|
-
/>
|
|
78
|
-
|
|
79
|
-
<Text sx={{ textAlign: 'center', fontSize: 13 }}>
|
|
80
|
-
<Text text="Don't have an account? " sx={{ color: 'var(--muted-foreground)' }} />
|
|
81
|
-
<Link label="Sign up" to="/signup" />
|
|
82
|
-
</Text>
|
|
83
|
-
</Stack>
|
|
84
|
-
</Card>
|
|
85
|
-
</Stack>
|
|
86
|
-
);
|
|
87
|
-
}
|
|
88
|
-
`;
|
|
89
|
-
|
|
90
|
-
const ADDON_SIGNUP = `import { Stack, Heading, Text, TextInput, Button, Card, Link } from '@mindmatrix/react';
|
|
91
|
-
import { useAuth, useForm, useRouter } from '@mindmatrix/react';
|
|
92
|
-
|
|
93
|
-
/**
|
|
94
|
-
* Signup page — registration form with password confirmation.
|
|
95
|
-
*/
|
|
96
|
-
export default function SignupPage() {
|
|
97
|
-
const { login } = useAuth();
|
|
98
|
-
const router = useRouter();
|
|
99
|
-
const form = useForm({
|
|
100
|
-
fields: {
|
|
101
|
-
fullName: { initial: '', required: true },
|
|
102
|
-
email: { initial: '', required: true },
|
|
103
|
-
password: { initial: '', required: true },
|
|
104
|
-
confirmPassword: { initial: '', required: true },
|
|
105
|
-
},
|
|
106
|
-
validate: (values) => {
|
|
107
|
-
const errors: Record<string, string> = {};
|
|
108
|
-
if (values.password.length < 8) errors.password = 'Password must be at least 8 characters';
|
|
109
|
-
if (values.password !== values.confirmPassword) errors.confirmPassword = 'Passwords do not match';
|
|
110
|
-
return errors;
|
|
111
|
-
},
|
|
112
|
-
});
|
|
113
|
-
|
|
114
|
-
const handleSubmit = async () => {
|
|
115
|
-
if (!form.isValid) return;
|
|
116
|
-
try {
|
|
117
|
-
const res = await fetch('/api/v1/auth/register', {
|
|
118
|
-
method: 'POST',
|
|
119
|
-
headers: { 'Content-Type': 'application/json' },
|
|
120
|
-
body: JSON.stringify({
|
|
121
|
-
email: form.values.email,
|
|
122
|
-
password: form.values.password,
|
|
123
|
-
full_name: form.values.fullName,
|
|
124
|
-
}),
|
|
125
|
-
});
|
|
126
|
-
if (!res.ok) {
|
|
127
|
-
const body = await res.json().catch(() => ({}));
|
|
128
|
-
throw new Error(body.message || 'Registration failed');
|
|
129
|
-
}
|
|
130
|
-
const { token } = await res.json();
|
|
131
|
-
localStorage.setItem('auth_token', token);
|
|
132
|
-
await login({ email: form.values.email, password: form.values.password });
|
|
133
|
-
router.navigate('/');
|
|
134
|
-
} catch (err) {
|
|
135
|
-
form.setError('email', err instanceof Error ? err.message : 'Registration failed');
|
|
136
|
-
}
|
|
137
|
-
};
|
|
138
|
-
|
|
139
|
-
return (
|
|
140
|
-
<Stack sx={{ minHeight: '100vh', alignItems: 'center', justifyContent: 'center', background: 'var(--muted)', padding: 24 }}>
|
|
141
|
-
<Card sx={{ maxWidth: 400, width: '100%', padding: 32 }}>
|
|
142
|
-
<Stack gap={20}>
|
|
143
|
-
<Stack gap={4} sx={{ textAlign: 'center' }}>
|
|
144
|
-
<Heading text="Create Account" level="h2" />
|
|
145
|
-
<Text text="Get started with your new account" sx={{ color: 'var(--muted-foreground)', fontSize: 14 }} />
|
|
146
|
-
</Stack>
|
|
147
|
-
|
|
148
|
-
<Stack gap={12}>
|
|
149
|
-
<TextInput
|
|
150
|
-
label="Full Name"
|
|
151
|
-
placeholder="John Doe"
|
|
152
|
-
value={form.values.fullName}
|
|
153
|
-
onChange={form.register('fullName').onChange}
|
|
154
|
-
error={form.errors.fullName}
|
|
155
|
-
/>
|
|
156
|
-
<TextInput
|
|
157
|
-
label="Email"
|
|
158
|
-
placeholder="you@example.com"
|
|
159
|
-
value={form.values.email}
|
|
160
|
-
onChange={form.register('email').onChange}
|
|
161
|
-
error={form.errors.email}
|
|
162
|
-
/>
|
|
163
|
-
<TextInput
|
|
164
|
-
label="Password"
|
|
165
|
-
placeholder="At least 8 characters"
|
|
166
|
-
type="password"
|
|
167
|
-
value={form.values.password}
|
|
168
|
-
onChange={form.register('password').onChange}
|
|
169
|
-
error={form.errors.password}
|
|
170
|
-
/>
|
|
171
|
-
<TextInput
|
|
172
|
-
label="Confirm Password"
|
|
173
|
-
placeholder="\\u2022\\u2022\\u2022\\u2022\\u2022\\u2022\\u2022\\u2022"
|
|
174
|
-
type="password"
|
|
175
|
-
value={form.values.confirmPassword}
|
|
176
|
-
onChange={form.register('confirmPassword').onChange}
|
|
177
|
-
error={form.errors.confirmPassword}
|
|
178
|
-
/>
|
|
179
|
-
</Stack>
|
|
180
|
-
|
|
181
|
-
<Button
|
|
182
|
-
label="Create Account"
|
|
183
|
-
variant="primary"
|
|
184
|
-
onClick={handleSubmit}
|
|
185
|
-
disabled={!form.isValid}
|
|
186
|
-
sx={{ width: '100%' }}
|
|
187
|
-
/>
|
|
188
|
-
|
|
189
|
-
<Text sx={{ textAlign: 'center', fontSize: 13 }}>
|
|
190
|
-
<Text text="Already have an account? " sx={{ color: 'var(--muted-foreground)' }} />
|
|
191
|
-
<Link label="Sign in" to="/login" />
|
|
192
|
-
</Text>
|
|
193
|
-
</Stack>
|
|
194
|
-
</Card>
|
|
195
|
-
</Stack>
|
|
196
|
-
);
|
|
197
|
-
}
|
|
198
|
-
`;
|
|
199
|
-
|
|
200
|
-
const ADDON_USER_MENU = `import { Stack, Text, Button } from '@mindmatrix/react';
|
|
201
|
-
import { useAuth } from '@mindmatrix/react';
|
|
202
|
-
|
|
203
|
-
/**
|
|
204
|
-
* UserMenu — displays current user name with a logout button.
|
|
205
|
-
* Composed from atoms, no custom atom needed.
|
|
206
|
-
*/
|
|
207
|
-
export default function UserMenu() {
|
|
208
|
-
const { user, logout } = useAuth();
|
|
209
|
-
|
|
210
|
-
return (
|
|
211
|
-
<Stack direction="row" gap={8} sx={{ alignItems: 'center' }}>
|
|
212
|
-
{/* User initial avatar */}
|
|
213
|
-
<Stack sx={{
|
|
214
|
-
width: 28, height: 28, borderRadius: '50%',
|
|
215
|
-
background: 'var(--primary)', color: 'var(--primary-foreground)',
|
|
216
|
-
alignItems: 'center', justifyContent: 'center',
|
|
217
|
-
fontSize: 12, fontWeight: 600,
|
|
218
|
-
}}>
|
|
219
|
-
<Text text={user?.name?.charAt(0)?.toUpperCase() || '?'} />
|
|
220
|
-
</Stack>
|
|
221
|
-
<Text text={user?.name || 'User'} sx={{ fontSize: 13, fontWeight: 500 }} />
|
|
222
|
-
<Button label="Logout" variant="ghost" onClick={logout} sx={{ fontSize: 12 }} />
|
|
223
|
-
</Stack>
|
|
224
|
-
);
|
|
225
|
-
}
|
|
226
|
-
`;
|
|
227
|
-
|
|
228
|
-
// =============================================================================
|
|
229
|
-
// Auth App Template Strings (from project-templates/auth-app.ts)
|
|
230
|
-
// =============================================================================
|
|
231
|
-
|
|
232
|
-
const TEMPLATE_MAIN_WORKFLOW = `import { Route, Stack } from '@mindmatrix/react';
|
|
233
|
-
import { useAuth } from '@mindmatrix/react';
|
|
234
|
-
import LoginPage from './pages/login';
|
|
235
|
-
import SignupPage from './pages/signup';
|
|
236
|
-
import HomePage from './pages/home';
|
|
237
|
-
|
|
238
|
-
/**
|
|
239
|
-
* My Auth App — Root app with auth-protected routing.
|
|
240
|
-
*
|
|
241
|
-
* Route guards use $user.authenticated — unauthenticated users
|
|
242
|
-
* are redirected to /login automatically.
|
|
243
|
-
*/
|
|
244
|
-
export default function App() {
|
|
245
|
-
return (
|
|
246
|
-
<>
|
|
247
|
-
<Route path="/login">
|
|
248
|
-
<LoginPage />
|
|
249
|
-
</Route>
|
|
250
|
-
<Route path="/signup">
|
|
251
|
-
<SignupPage />
|
|
252
|
-
</Route>
|
|
253
|
-
<Route path="/" guard="$user.authenticated" redirect="/login">
|
|
254
|
-
<HomePage />
|
|
255
|
-
</Route>
|
|
256
|
-
</>
|
|
257
|
-
);
|
|
258
|
-
}
|
|
259
|
-
`;
|
|
260
|
-
|
|
261
|
-
const TEMPLATE_HOME = `import { Stack, Heading, Text, Button, Card } from '@mindmatrix/react';
|
|
262
|
-
import { useAuth } from '@mindmatrix/react';
|
|
263
|
-
import UserMenu from '../components/user-menu';
|
|
264
|
-
|
|
265
|
-
/**
|
|
266
|
-
* Home page — protected, only visible when authenticated.
|
|
267
|
-
* The route guard ($user.authenticated) handles redirect to /login.
|
|
268
|
-
*/
|
|
269
|
-
export default function HomePage() {
|
|
270
|
-
const { user } = useAuth();
|
|
271
|
-
|
|
272
|
-
return (
|
|
273
|
-
<Stack gap={0} sx={{ minHeight: '100vh' }}>
|
|
274
|
-
{/* Top bar */}
|
|
275
|
-
<Stack direction="row" sx={{ padding: '12px 24px', borderBottom: '1px solid var(--border)', alignItems: 'center', justifyContent: 'space-between' }}>
|
|
276
|
-
<Heading text="My Auth App" level="h3" />
|
|
277
|
-
<UserMenu />
|
|
278
|
-
</Stack>
|
|
279
|
-
|
|
280
|
-
{/* Content */}
|
|
281
|
-
<Stack sx={{ padding: 24, flex: 1 }} gap={16}>
|
|
282
|
-
<Heading text={\`Welcome, \${user?.name || 'User'}!\`} level="h2" />
|
|
283
|
-
<Text text="You are now logged in. This content is protected by a route guard." sx={{ color: 'var(--muted-foreground)' }} />
|
|
284
|
-
|
|
285
|
-
<Stack direction="row" gap={16}>
|
|
286
|
-
<Card sx={{ padding: 20, flex: 1 }}>
|
|
287
|
-
<Stack gap={4}>
|
|
288
|
-
<Text text="Email" sx={{ fontSize: 12, color: 'var(--muted-foreground)' }} />
|
|
289
|
-
<Text text={user?.email || ''} />
|
|
290
|
-
</Stack>
|
|
291
|
-
</Card>
|
|
292
|
-
<Card sx={{ padding: 20, flex: 1 }}>
|
|
293
|
-
<Stack gap={4}>
|
|
294
|
-
<Text text="Role" sx={{ fontSize: 12, color: 'var(--muted-foreground)' }} />
|
|
295
|
-
<Text text={user?.roles?.join(', ') || 'user'} />
|
|
296
|
-
</Stack>
|
|
297
|
-
</Card>
|
|
298
|
-
</Stack>
|
|
299
|
-
</Stack>
|
|
300
|
-
</Stack>
|
|
301
|
-
);
|
|
302
|
-
}
|
|
303
|
-
`;
|
|
304
|
-
|
|
305
|
-
// =============================================================================
|
|
306
|
-
// Helpers
|
|
307
|
-
// =============================================================================
|
|
308
|
-
|
|
309
|
-
function findByComponent(node: IRExperienceNode, component: string): IRExperienceNode | undefined {
|
|
310
|
-
if (node.component === component) return node;
|
|
311
|
-
for (const child of node.children ?? []) {
|
|
312
|
-
const found = findByComponent(child, component);
|
|
313
|
-
if (found) return found;
|
|
314
|
-
}
|
|
315
|
-
return undefined;
|
|
316
|
-
}
|
|
317
|
-
|
|
318
|
-
function findAllByComponent(node: IRExperienceNode, component: string): IRExperienceNode[] {
|
|
319
|
-
const results: IRExperienceNode[] = [];
|
|
320
|
-
if (node.component === component) results.push(node);
|
|
321
|
-
for (const child of node.children ?? []) {
|
|
322
|
-
results.push(...findAllByComponent(child, component));
|
|
323
|
-
}
|
|
324
|
-
return results;
|
|
325
|
-
}
|
|
326
|
-
|
|
327
|
-
// =============================================================================
|
|
328
|
-
// Tests: Individual File Compilation (Add-on files)
|
|
329
|
-
// =============================================================================
|
|
330
|
-
|
|
331
|
-
describe('Auth Add-on Template Compilation', () => {
|
|
332
|
-
describe('Individual file compilation (add-on pages/)', () => {
|
|
333
|
-
it('should compile pages/login.tsx (add-on)', () => {
|
|
334
|
-
const result = compileProject({
|
|
335
|
-
'mm.config.ts': `
|
|
336
|
-
import { defineBlueprint } from '@mindmatrix/react';
|
|
337
|
-
export default defineBlueprint({ slug: 'auth-addon-test', name: 'Auth Addon Test', version: '1.0.0' });
|
|
338
|
-
`,
|
|
339
|
-
'pages/login.tsx': ADDON_LOGIN,
|
|
340
|
-
});
|
|
341
|
-
|
|
342
|
-
console.log('pages/login.tsx errors:', JSON.stringify(result.errors, null, 2));
|
|
343
|
-
console.log('pages/login.tsx warnings:', JSON.stringify(result.warnings, null, 2));
|
|
344
|
-
|
|
345
|
-
expect(result.errors.filter(e => e.severity === 'error')).toHaveLength(0);
|
|
346
|
-
expect(result.fileIRs['pages/login.tsx']).toBeDefined();
|
|
347
|
-
});
|
|
348
|
-
|
|
349
|
-
it('should compile pages/signup.tsx (add-on)', () => {
|
|
350
|
-
const result = compileProject({
|
|
351
|
-
'mm.config.ts': `
|
|
352
|
-
import { defineBlueprint } from '@mindmatrix/react';
|
|
353
|
-
export default defineBlueprint({ slug: 'auth-addon-test', name: 'Auth Addon Test', version: '1.0.0' });
|
|
354
|
-
`,
|
|
355
|
-
'pages/signup.tsx': ADDON_SIGNUP,
|
|
356
|
-
});
|
|
357
|
-
|
|
358
|
-
console.log('pages/signup.tsx errors:', JSON.stringify(result.errors, null, 2));
|
|
359
|
-
console.log('pages/signup.tsx warnings:', JSON.stringify(result.warnings, null, 2));
|
|
360
|
-
|
|
361
|
-
expect(result.errors.filter(e => e.severity === 'error')).toHaveLength(0);
|
|
362
|
-
expect(result.fileIRs['pages/signup.tsx']).toBeDefined();
|
|
363
|
-
});
|
|
364
|
-
|
|
365
|
-
it('should compile components/user-menu.tsx (add-on)', () => {
|
|
366
|
-
const result = compileProject({
|
|
367
|
-
'mm.config.ts': `
|
|
368
|
-
import { defineBlueprint } from '@mindmatrix/react';
|
|
369
|
-
export default defineBlueprint({ slug: 'auth-addon-test', name: 'Auth Addon Test', version: '1.0.0' });
|
|
370
|
-
`,
|
|
371
|
-
'components/user-menu.tsx': ADDON_USER_MENU,
|
|
372
|
-
});
|
|
373
|
-
|
|
374
|
-
console.log('components/user-menu.tsx errors:', JSON.stringify(result.errors, null, 2));
|
|
375
|
-
console.log('components/user-menu.tsx warnings:', JSON.stringify(result.warnings, null, 2));
|
|
376
|
-
|
|
377
|
-
expect(result.errors.filter(e => e.severity === 'error')).toHaveLength(0);
|
|
378
|
-
expect(result.fileIRs['components/user-menu.tsx']).toBeDefined();
|
|
379
|
-
});
|
|
380
|
-
});
|
|
381
|
-
|
|
382
|
-
describe('All add-on files together', () => {
|
|
383
|
-
it('should compile all add-on files as a project', () => {
|
|
384
|
-
const result = compileProject({
|
|
385
|
-
'mm.config.ts': `
|
|
386
|
-
import { defineBlueprint } from '@mindmatrix/react';
|
|
387
|
-
export default defineBlueprint({ slug: 'auth-addon-full', name: 'Auth Addon Full', version: '1.0.0' });
|
|
388
|
-
`,
|
|
389
|
-
'pages/login.tsx': ADDON_LOGIN,
|
|
390
|
-
'pages/signup.tsx': ADDON_SIGNUP,
|
|
391
|
-
'components/user-menu.tsx': ADDON_USER_MENU,
|
|
392
|
-
});
|
|
393
|
-
|
|
394
|
-
console.log('All add-on files errors:', JSON.stringify(result.errors, null, 2));
|
|
395
|
-
console.log('All add-on files warnings:', JSON.stringify(result.warnings, null, 2));
|
|
396
|
-
|
|
397
|
-
const fileErrors = result.errors.filter(e => e.severity === 'error');
|
|
398
|
-
if (fileErrors.length > 0) {
|
|
399
|
-
console.log('FAILING FILES:');
|
|
400
|
-
for (const err of fileErrors) {
|
|
401
|
-
console.log(` ${err.file} (line ${err.line}): ${err.message}`);
|
|
402
|
-
}
|
|
403
|
-
}
|
|
404
|
-
|
|
405
|
-
expect(fileErrors).toHaveLength(0);
|
|
406
|
-
});
|
|
407
|
-
});
|
|
408
|
-
});
|
|
409
|
-
|
|
410
|
-
// =============================================================================
|
|
411
|
-
// Tests: Auth App Template Files
|
|
412
|
-
// =============================================================================
|
|
413
|
-
|
|
414
|
-
describe('Auth App Template Compilation', () => {
|
|
415
|
-
describe('Individual file compilation (template)', () => {
|
|
416
|
-
it('should compile main.workflow.tsx (template)', () => {
|
|
417
|
-
const result = compileProject({
|
|
418
|
-
'mm.config.ts': `
|
|
419
|
-
import { defineBlueprint } from '@mindmatrix/react';
|
|
420
|
-
export default defineBlueprint({ slug: 'auth-app', name: 'Auth App', version: '1.0.0' });
|
|
421
|
-
`,
|
|
422
|
-
'main.workflow.tsx': TEMPLATE_MAIN_WORKFLOW,
|
|
423
|
-
});
|
|
424
|
-
|
|
425
|
-
console.log('main.workflow.tsx errors:', JSON.stringify(result.errors, null, 2));
|
|
426
|
-
console.log('main.workflow.tsx warnings:', JSON.stringify(result.warnings, null, 2));
|
|
427
|
-
|
|
428
|
-
expect(result.errors.filter(e => e.severity === 'error')).toHaveLength(0);
|
|
429
|
-
expect(result.fileIRs['main.workflow.tsx']).toBeDefined();
|
|
430
|
-
});
|
|
431
|
-
|
|
432
|
-
it('should compile pages/login.tsx (template — same as add-on)', () => {
|
|
433
|
-
const result = compileProject({
|
|
434
|
-
'pages/login.tsx': ADDON_LOGIN,
|
|
435
|
-
});
|
|
436
|
-
|
|
437
|
-
console.log('template pages/login.tsx errors:', JSON.stringify(result.errors, null, 2));
|
|
438
|
-
expect(result.errors.filter(e => e.severity === 'error')).toHaveLength(0);
|
|
439
|
-
});
|
|
440
|
-
|
|
441
|
-
it('should compile pages/signup.tsx (template — same as add-on)', () => {
|
|
442
|
-
const result = compileProject({
|
|
443
|
-
'pages/signup.tsx': ADDON_SIGNUP,
|
|
444
|
-
});
|
|
445
|
-
|
|
446
|
-
console.log('template pages/signup.tsx errors:', JSON.stringify(result.errors, null, 2));
|
|
447
|
-
expect(result.errors.filter(e => e.severity === 'error')).toHaveLength(0);
|
|
448
|
-
});
|
|
449
|
-
|
|
450
|
-
it('should compile pages/home.tsx (template)', () => {
|
|
451
|
-
const result = compileProject({
|
|
452
|
-
'mm.config.ts': `
|
|
453
|
-
import { defineBlueprint } from '@mindmatrix/react';
|
|
454
|
-
export default defineBlueprint({ slug: 'auth-app', name: 'Auth App', version: '1.0.0' });
|
|
455
|
-
`,
|
|
456
|
-
'pages/home.tsx': TEMPLATE_HOME,
|
|
457
|
-
'components/user-menu.tsx': ADDON_USER_MENU,
|
|
458
|
-
});
|
|
459
|
-
|
|
460
|
-
console.log('pages/home.tsx errors:', JSON.stringify(result.errors, null, 2));
|
|
461
|
-
console.log('pages/home.tsx warnings:', JSON.stringify(result.warnings, null, 2));
|
|
462
|
-
|
|
463
|
-
expect(result.errors.filter(e => e.severity === 'error')).toHaveLength(0);
|
|
464
|
-
expect(result.fileIRs['pages/home.tsx']).toBeDefined();
|
|
465
|
-
});
|
|
466
|
-
|
|
467
|
-
it('should compile components/user-menu.tsx (template — same as add-on)', () => {
|
|
468
|
-
const result = compileProject({
|
|
469
|
-
'components/user-menu.tsx': ADDON_USER_MENU,
|
|
470
|
-
});
|
|
471
|
-
|
|
472
|
-
console.log('template components/user-menu.tsx errors:', JSON.stringify(result.errors, null, 2));
|
|
473
|
-
expect(result.errors.filter(e => e.severity === 'error')).toHaveLength(0);
|
|
474
|
-
});
|
|
475
|
-
});
|
|
476
|
-
|
|
477
|
-
describe('Full auth-app template project', () => {
|
|
478
|
-
it('should compile all auth-app template files together', () => {
|
|
479
|
-
const result = compileProject({
|
|
480
|
-
'mm.config.ts': `import { defineBlueprint } from '@mindmatrix/react';
|
|
481
|
-
|
|
482
|
-
export default defineBlueprint({
|
|
483
|
-
slug: 'my-auth-app',
|
|
484
|
-
name: 'My Auth App',
|
|
485
|
-
version: '1.0.0',
|
|
486
|
-
category: 'blueprint',
|
|
487
|
-
description: 'My Auth App — app with authentication',
|
|
488
|
-
});
|
|
489
|
-
`,
|
|
490
|
-
'main.workflow.tsx': TEMPLATE_MAIN_WORKFLOW,
|
|
491
|
-
'pages/login.tsx': ADDON_LOGIN,
|
|
492
|
-
'pages/signup.tsx': ADDON_SIGNUP,
|
|
493
|
-
'pages/home.tsx': TEMPLATE_HOME,
|
|
494
|
-
'components/user-menu.tsx': ADDON_USER_MENU,
|
|
495
|
-
});
|
|
496
|
-
|
|
497
|
-
console.log('Full auth-app errors:', JSON.stringify(result.errors, null, 2));
|
|
498
|
-
console.log('Full auth-app warnings:', JSON.stringify(result.warnings, null, 2));
|
|
499
|
-
|
|
500
|
-
const fileErrors = result.errors.filter(e => e.severity === 'error');
|
|
501
|
-
if (fileErrors.length > 0) {
|
|
502
|
-
console.log('FAILING FILES:');
|
|
503
|
-
for (const err of fileErrors) {
|
|
504
|
-
console.log(` ${err.file} (line ${err.line}:${err.column}): ${err.message}`);
|
|
505
|
-
}
|
|
506
|
-
}
|
|
507
|
-
|
|
508
|
-
// Report which files compiled successfully
|
|
509
|
-
console.log('Successfully compiled files:', Object.keys(result.fileIRs));
|
|
510
|
-
console.log('Page experiences:', Object.keys(result.pageExperiences));
|
|
511
|
-
console.log('Component definitions:', Object.keys(result.componentDefinitions));
|
|
512
|
-
console.log('Child definitions:', result.childDefinitions.map(cd => cd.slug));
|
|
513
|
-
console.log('Route table:', result.routeTable);
|
|
514
|
-
|
|
515
|
-
expect(fileErrors).toHaveLength(0);
|
|
516
|
-
});
|
|
517
|
-
|
|
518
|
-
it('should produce correct experience tree structure', () => {
|
|
519
|
-
const result = compileProject({
|
|
520
|
-
'mm.config.ts': `import { defineBlueprint } from '@mindmatrix/react';
|
|
521
|
-
export default defineBlueprint({ slug: 'auth-exp-test', name: 'Auth Exp Test', version: '1.0.0' });
|
|
522
|
-
`,
|
|
523
|
-
'main.workflow.tsx': TEMPLATE_MAIN_WORKFLOW,
|
|
524
|
-
'pages/login.tsx': ADDON_LOGIN,
|
|
525
|
-
'pages/signup.tsx': ADDON_SIGNUP,
|
|
526
|
-
'pages/home.tsx': TEMPLATE_HOME,
|
|
527
|
-
'components/user-menu.tsx': ADDON_USER_MENU,
|
|
528
|
-
});
|
|
529
|
-
|
|
530
|
-
if (result.errors.filter(e => e.severity === 'error').length > 0) {
|
|
531
|
-
console.log('Skipping experience tree check due to compilation errors');
|
|
532
|
-
console.log('Errors:', JSON.stringify(result.errors, null, 2));
|
|
533
|
-
return;
|
|
534
|
-
}
|
|
535
|
-
|
|
536
|
-
// Check that we got an experience tree
|
|
537
|
-
const exp = (result.ir as any).experience as IRExperienceNode | undefined;
|
|
538
|
-
console.log('Experience tree:', JSON.stringify(exp, null, 2).substring(0, 2000));
|
|
539
|
-
|
|
540
|
-
if (exp) {
|
|
541
|
-
// Should have some meaningful structure
|
|
542
|
-
expect(exp.component).toBeDefined();
|
|
543
|
-
console.log('Root component:', exp.component);
|
|
544
|
-
console.log('Children count:', exp.children?.length);
|
|
545
|
-
}
|
|
546
|
-
});
|
|
547
|
-
});
|
|
548
|
-
|
|
549
|
-
describe('Detailed per-file IR inspection', () => {
|
|
550
|
-
it('should inspect main.workflow.tsx IR structure', () => {
|
|
551
|
-
const result = compileProject({
|
|
552
|
-
'main.workflow.tsx': TEMPLATE_MAIN_WORKFLOW,
|
|
553
|
-
});
|
|
554
|
-
|
|
555
|
-
const ir = result.fileIRs['main.workflow.tsx'];
|
|
556
|
-
if (ir) {
|
|
557
|
-
console.log('main.workflow.tsx IR slug:', ir.slug);
|
|
558
|
-
console.log('main.workflow.tsx IR states:', ir.states.map(s => s.name));
|
|
559
|
-
console.log('main.workflow.tsx IR fields:', ir.fields.map(f => f.name));
|
|
560
|
-
const views = (ir as any).views;
|
|
561
|
-
if (views?.default) {
|
|
562
|
-
console.log('main.workflow.tsx view tree:', JSON.stringify(views.default, null, 2).substring(0, 1500));
|
|
563
|
-
}
|
|
564
|
-
} else {
|
|
565
|
-
console.log('main.workflow.tsx did NOT produce an IR');
|
|
566
|
-
console.log('Errors:', JSON.stringify(result.errors, null, 2));
|
|
567
|
-
}
|
|
568
|
-
});
|
|
569
|
-
|
|
570
|
-
it('should inspect pages/login.tsx IR for experience nodes', () => {
|
|
571
|
-
const result = compileProject({
|
|
572
|
-
'pages/login.tsx': ADDON_LOGIN,
|
|
573
|
-
});
|
|
574
|
-
|
|
575
|
-
const ir = result.fileIRs['pages/login.tsx'];
|
|
576
|
-
if (ir) {
|
|
577
|
-
const views = (ir as any).views;
|
|
578
|
-
if (views?.default) {
|
|
579
|
-
const stacks = findAllByComponent(views.default, 'Stack');
|
|
580
|
-
const buttons = findAllByComponent(views.default, 'Button');
|
|
581
|
-
const textInputs = findAllByComponent(views.default, 'TextInput');
|
|
582
|
-
console.log('Login page Stack nodes:', stacks.length);
|
|
583
|
-
console.log('Login page Button nodes:', buttons.length);
|
|
584
|
-
console.log('Login page TextInput nodes:', textInputs.length);
|
|
585
|
-
}
|
|
586
|
-
}
|
|
587
|
-
});
|
|
588
|
-
});
|
|
589
|
-
});
|