@effindomv2/create-fui-as-app 0.1.4 → 0.1.5

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.
Files changed (42) hide show
  1. package/build/templates/hello/harness.ts +1 -1
  2. package/build/templates/hello/package.json +3 -3
  3. package/build/templates/hello/src/App.ts +3 -3
  4. package/build/templates/hello/src/HelloWorld.ts +4 -4
  5. package/build/templates/hello/src/fui/Fui.ts +1 -0
  6. package/build/templates/hello/src/fui/FuiBrowser.ts +1 -0
  7. package/build/templates/hello/src/fui/FuiExports.ts +1 -0
  8. package/build/templates/hello/src/fui/FuiPrimitives.ts +1 -0
  9. package/build/templates/hello/src/{generated → host/generated}/HostEvents.ts +1 -1
  10. package/build/templates/hello/src/host/host-events.ts +1 -1
  11. package/build/templates/hello/src/host/host-services.ts +1 -1
  12. package/build/templates/mvc/harness.ts +1 -1
  13. package/build/templates/mvc/package.json +3 -3
  14. package/build/templates/mvc/src/fui/Fui.ts +1 -0
  15. package/build/templates/mvc/src/fui/FuiBrowser.ts +1 -0
  16. package/build/templates/mvc/src/fui/FuiExports.ts +1 -0
  17. package/build/templates/mvc/src/fui/FuiPrimitives.ts +1 -0
  18. package/build/templates/mvc/src/{generated → host/generated}/HostEvents.ts +1 -1
  19. package/build/templates/mvc/src/host/host-events.ts +1 -1
  20. package/build/templates/mvc/src/host/host-services.ts +1 -1
  21. package/build/templates/mvc/src/routes/mvc/pages/home/HomeController.ts +4 -4
  22. package/build/templates/mvc/src/routes/mvc/pages/home/HomeView.ts +1 -1
  23. package/build/templates/mvc/src/routes/mvc/pages/settings/SettingsController.ts +1 -1
  24. package/build/templates/mvc/src/routes/mvc/pages/settings/SettingsView.ts +1 -1
  25. package/build/templates/mvc/src/routes/mvc/shared/design-system/MvcNavPill.ts +1 -1
  26. package/build/templates/mvc/src/routes/mvc/shared/design-system/MvcPrimaryButton.ts +1 -1
  27. package/build/templates/mvc/src/routes/mvc/shared/routes.ts +1 -1
  28. package/build/templates/mvc/src/routes/mvc_home.ts +3 -3
  29. package/build/templates/mvc/src/routes/mvc_settings.ts +3 -3
  30. package/dist/scripts/sync-templates.js +16 -16
  31. package/dist/tests/scaffold.test.js +6 -0
  32. package/package.json +1 -1
  33. package/build/templates/hello/src/Fui.ts +0 -1
  34. package/build/templates/hello/src/FuiBrowser.ts +0 -1
  35. package/build/templates/hello/src/FuiExports.ts +0 -1
  36. package/build/templates/hello/src/FuiPrimitives.ts +0 -1
  37. package/build/templates/mvc/src/Fui.ts +0 -1
  38. package/build/templates/mvc/src/FuiBrowser.ts +0 -1
  39. package/build/templates/mvc/src/FuiExports.ts +0 -1
  40. package/build/templates/mvc/src/FuiPrimitives.ts +0 -1
  41. /package/build/templates/hello/src/{generated → host/generated}/HostServices.ts +0 -0
  42. /package/build/templates/mvc/src/{generated → host/generated}/HostServices.ts +0 -0
package/build/templates/hello/harness.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { startHarness } from './src/FuiBrowser';
1
+ import { startHarness } from './src/fui/FuiBrowser';
2
2
  import { appHostEvents } from './src/host/host-events';
3
3
  import { appHostServices } from './src/host/host-services';
4
4
 
package/build/templates/hello/package.json CHANGED
@@ -9,10 +9,10 @@
9
9
  "build:assets": "tsx scripts/prepare-runtime.ts",
10
10
  "build:wasm": "asc src/App.ts --config asconfig.json --target release",
11
11
  "build:harness": "esbuild harness.ts --bundle --format=esm --platform=browser --outfile=public/harness.js",
12
- "generate:host-services": "tsx ./node_modules/@effindomv2/fui-as/scripts/generate-host-services.ts src/host/host-services.ts appHostServices src/generated/HostServices.ts ../FuiPrimitives",
13
- "generate:host-events": "tsx ./node_modules/@effindomv2/fui-as/scripts/generate-host-events.ts src/host/host-events.ts appHostEvents src/generated/HostEvents.ts ../FuiPrimitives",
12
+ "generate:host-services": "tsx ./node_modules/@effindomv2/fui-as/scripts/generate-host-services.ts src/host/host-services.ts appHostServices src/host/generated/HostServices.ts ../../fui/FuiPrimitives",
13
+ "generate:host-events": "tsx ./node_modules/@effindomv2/fui-as/scripts/generate-host-events.ts src/host/host-events.ts appHostEvents src/host/generated/HostEvents.ts ../../fui/FuiPrimitives",
14
14
  "generate:host": "npm run generate:host-services && npm run generate:host-events",
15
- "watch": "chokidar \"src/**/*.ts\" \"harness.ts\" \"index.html\" \"asconfig.json\" -c \"npm run build\"",
15
+ "watch": "chokidar \"src/**/*.ts\" \"harness.ts\" \"index.html\" \"asconfig.json\" --ignore \"src/host/generated/**\" -c \"npm run build\"",
16
16
  "serve": "http-server public -p 8080 -c-1",
17
17
  "dev": "npm run build && concurrently -k -n watch,serve \"npm run watch\" \"npm run serve\"",
18
18
  "test": "npm run build && tsx scripts/smoke.ts"
package/build/templates/hello/src/App.ts CHANGED
@@ -1,6 +1,6 @@
1
- import { Application } from "./Fui";
2
- export * from "./FuiExports";
3
- export * from "./generated/HostEvents";
1
+ import { Application } from "./fui/Fui";
2
+ export * from "./fui/FuiExports";
3
+ export * from "./host/generated/HostEvents";
4
4
 
5
5
  import { createHelloWorldPage } from "./HelloWorld";
6
6
 
package/build/templates/hello/src/HelloWorld.ts CHANGED
@@ -8,10 +8,10 @@ import {
8
8
  Text,
9
9
  TextAlign,
10
10
  Unit,
11
- } from "./Fui";
12
- import { Callback1 } from "./FuiPrimitives";
13
- import { onAppClockTick } from "./generated/HostEvents";
14
- import { appClockNowUnixSeconds } from "./generated/HostServices";
11
+ } from "./fui/Fui";
12
+ import { Callback1 } from "./fui/FuiPrimitives";
13
+ import { onAppClockTick } from "./host/generated/HostEvents";
14
+ import { appClockNowUnixSeconds } from "./host/generated/HostServices";
15
15
 
16
16
  class ClockTickHandler extends Callback1<i32> {
17
17
  private readonly owner: HelloWorld;
package/build/templates/hello/src/fui/Fui.ts ADDED
@@ -0,0 +1 @@
1
+ export * from "../../node_modules/@effindomv2/fui-as/src/Fui";
package/build/templates/hello/src/fui/FuiBrowser.ts ADDED
@@ -0,0 +1 @@
1
+ export * from "../../node_modules/@effindomv2/fui-as/browser/src/index";
package/build/templates/hello/src/fui/FuiExports.ts ADDED
@@ -0,0 +1 @@
1
+ export * from "../../node_modules/@effindomv2/fui-as/src/FuiExports";
package/build/templates/hello/src/fui/FuiPrimitives.ts ADDED
@@ -0,0 +1 @@
1
+ export * from "../../node_modules/@effindomv2/fui-as/src/FuiPrimitives";
package/build/templates/hello/src/{generated → host/generated}/HostEvents.ts RENAMED
@@ -1,5 +1,5 @@
1
1
  // Generated from the scaffold host-events definition.
2
- import { Callback0, Callback1, Callback2 } from "../FuiPrimitives";
2
+ import { Callback0, Callback1, Callback2 } from "../../fui/FuiPrimitives";
3
3
 
4
4
  let __appClockTickHandler: Callback1<i32> | null = null;
5
5
 
package/build/templates/hello/src/host/host-events.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { defineHostEvents, hostEvent } from "../FuiBrowser";
1
+ import { defineHostEvents, hostEvent } from "../fui/FuiBrowser";
2
2
 
3
3
  function nowUnixSeconds(): number {
4
4
  return Math.floor(Date.now() / 1000);
package/build/templates/hello/src/host/host-services.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { defineHostServices, hostService } from "../FuiBrowser";
1
+ import { defineHostServices, hostService } from "../fui/FuiBrowser";
2
2
 
3
3
  function nowUnixSeconds(): number {
4
4
  return Math.floor(Date.now() / 1000);
package/build/templates/mvc/harness.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { startRoutedHarness, type HarnessExports, type RoutedHarnessRoute } from './src/FuiBrowser';
1
+ import { startRoutedHarness, type HarnessExports, type RoutedHarnessRoute } from './src/fui/FuiBrowser';
2
2
  import { appHostEvents } from './src/host/host-events';
3
3
  import { appHostServices } from './src/host/host-services';
4
4
 
package/build/templates/mvc/package.json CHANGED
@@ -11,10 +11,10 @@
11
11
  "build:wasm:home": "asc src/routes/mvc_home.ts --config asconfig.json --target release --outFile public/mvc-home.wasm",
12
12
  "build:wasm:settings": "asc src/routes/mvc_settings.ts --config asconfig.json --target release --outFile public/mvc-settings.wasm",
13
13
  "build:harness": "esbuild harness.ts --bundle --format=esm --platform=browser --outfile=public/harness.js",
14
- "generate:host-services": "tsx ./node_modules/@effindomv2/fui-as/scripts/generate-host-services.ts src/host/host-services.ts appHostServices src/generated/HostServices.ts ../FuiPrimitives",
15
- "generate:host-events": "tsx ./node_modules/@effindomv2/fui-as/scripts/generate-host-events.ts src/host/host-events.ts appHostEvents src/generated/HostEvents.ts ../FuiPrimitives",
14
+ "generate:host-services": "tsx ./node_modules/@effindomv2/fui-as/scripts/generate-host-services.ts src/host/host-services.ts appHostServices src/host/generated/HostServices.ts ../../fui/FuiPrimitives",
15
+ "generate:host-events": "tsx ./node_modules/@effindomv2/fui-as/scripts/generate-host-events.ts src/host/host-events.ts appHostEvents src/host/generated/HostEvents.ts ../../fui/FuiPrimitives",
16
16
  "generate:host": "npm run generate:host-services && npm run generate:host-events",
17
- "watch": "chokidar \"src/**/*.ts\" \"harness.ts\" \"route-shell.html\" \"index.html\" \"asconfig.json\" -c \"npm run build\"",
17
+ "watch": "chokidar \"src/**/*.ts\" \"harness.ts\" \"route-shell.html\" \"index.html\" \"asconfig.json\" --ignore \"src/host/generated/**\" -c \"npm run build\"",
18
18
  "serve": "http-server public -p 8080 -c-1",
19
19
  "dev": "npm run build && concurrently -k -n watch,serve \"npm run watch\" \"npm run serve\"",
20
20
  "test": "npm run build && tsx scripts/smoke.ts"
package/build/templates/mvc/src/fui/Fui.ts ADDED
@@ -0,0 +1 @@
1
+ export * from "../../node_modules/@effindomv2/fui-as/src/Fui";
package/build/templates/mvc/src/fui/FuiBrowser.ts ADDED
@@ -0,0 +1 @@
1
+ export * from "../../node_modules/@effindomv2/fui-as/browser/src/index";
package/build/templates/mvc/src/fui/FuiExports.ts ADDED
@@ -0,0 +1 @@
1
+ export * from "../../node_modules/@effindomv2/fui-as/src/FuiExports";
package/build/templates/mvc/src/fui/FuiPrimitives.ts ADDED
@@ -0,0 +1 @@
1
+ export * from "../../node_modules/@effindomv2/fui-as/src/FuiPrimitives";
package/build/templates/mvc/src/{generated → host/generated}/HostEvents.ts RENAMED
@@ -1,5 +1,5 @@
1
1
  // Generated from the scaffold host-events definition.
2
- import { Callback0, Callback1, Callback2 } from "../FuiPrimitives";
2
+ import { Callback0, Callback1, Callback2 } from "../../fui/FuiPrimitives";
3
3
 
4
4
  let __appClockTickHandler: Callback1<i32> | null = null;
5
5
 
package/build/templates/mvc/src/host/host-events.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { defineHostEvents, hostEvent } from "../FuiBrowser";
1
+ import { defineHostEvents, hostEvent } from "../fui/FuiBrowser";
2
2
 
3
3
  function nowUnixSeconds(): number {
4
4
  return Math.floor(Date.now() / 1000);
package/build/templates/mvc/src/host/host-services.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { defineHostServices, hostService } from "../FuiBrowser";
1
+ import { defineHostServices, hostService } from "../fui/FuiBrowser";
2
2
 
3
3
  function nowUnixSeconds(): number {
4
4
  return Math.floor(Date.now() / 1000);
package/build/templates/mvc/src/routes/mvc/pages/home/HomeController.ts CHANGED
@@ -1,7 +1,7 @@
1
- import { Application, Node } from "../../../../Fui";
2
- import { Callback1 } from "../../../../FuiPrimitives";
3
- import { onAppClockTick } from "../../../../generated/HostEvents";
4
- import { appClockNowUnixSeconds } from "../../../../generated/HostServices";
1
+ import { Application, Node } from "../../../../fui/Fui";
2
+ import { Callback1 } from "../../../../fui/FuiPrimitives";
3
+ import { onAppClockTick } from "../../../../host/generated/HostEvents";
4
+ import { appClockNowUnixSeconds } from "../../../../host/generated/HostServices";
5
5
  import { HomeModel } from "./HomeModel";
6
6
  import { HomeView } from "./HomeView";
7
7
 
package/build/templates/mvc/src/routes/mvc/pages/home/HomeView.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { Column, FlexBox, JustifyContent, Row, SelectionArea, Text, Unit, rgb } from "../../../../Fui";
1
+ import { Column, FlexBox, JustifyContent, Row, SelectionArea, Text, Unit, rgb } from "../../../../fui/Fui";
2
2
  import { MvcNavPill } from "../../shared/design-system/MvcNavPill";
3
3
  import { MvcPrimaryButton } from "../../shared/design-system/MvcPrimaryButton";
4
4
  import { mvcHomeRoute, mvcSettingsRoute } from "../../shared/routes";
package/build/templates/mvc/src/routes/mvc/pages/settings/SettingsController.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { Application, Node } from "../../../../Fui";
1
+ import { Application, Node } from "../../../../fui/Fui";
2
2
  import { SettingsModel } from "./SettingsModel";
3
3
  import { SettingsView } from "./SettingsView";
4
4
 
package/build/templates/mvc/src/routes/mvc/pages/settings/SettingsView.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { Column, FlexBox, JustifyContent, Row, SelectionArea, Text, Unit, rgb } from "../../../../Fui";
1
+ import { Column, FlexBox, JustifyContent, Row, SelectionArea, Text, Unit, rgb } from "../../../../fui/Fui";
2
2
  import { MvcNavPill } from "../../shared/design-system/MvcNavPill";
3
3
  import { MvcPrimaryButton } from "../../shared/design-system/MvcPrimaryButton";
4
4
  import { mvcHomeRoute, mvcSettingsRoute } from "../../shared/routes";
package/build/templates/mvc/src/routes/mvc/shared/design-system/MvcNavPill.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { NavLink, Text, rgb } from "../../../../Fui";
1
+ import { NavLink, Text, rgb } from "../../../../fui/Fui";
2
2
 
3
3
  const PILL_RADIUS: f32 = 999.0;
4
4
  const PILL_PADDING_X: f32 = 16.0;
package/build/templates/mvc/src/routes/mvc/shared/design-system/MvcPrimaryButton.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { Button, rgb } from "../../../../Fui";
1
+ import { Button, rgb } from "../../../../fui/Fui";
2
2
 
3
3
  const BUTTON_RADIUS: f32 = 12.0;
4
4
  const BUTTON_PADDING_X: f32 = 18.0;
package/build/templates/mvc/src/routes/mvc/shared/routes.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { currentRoute } from "../../../Fui";
1
+ import { currentRoute } from "../../../fui/Fui";
2
2
 
3
3
  const SOURCE_DEMO_BASE: string = "/v2/fui-as/demo-mvc";
4
4
  const SOURCE_HOME_ROUTE: string = "/v2/fui-as/demo-mvc/mvc-home/";
package/build/templates/mvc/src/routes/mvc_home.ts CHANGED
@@ -1,7 +1,7 @@
1
- export * from "../FuiExports";
2
- export * from "../generated/HostEvents";
1
+ export * from "../fui/FuiExports";
2
+ export * from "../host/generated/HostEvents";
3
3
 
4
- import { Node, createManagedApplication } from "../Fui";
4
+ import { Node, createManagedApplication } from "../fui/Fui";
5
5
  import { HomeController } from "./mvc/pages/home/HomeController";
6
6
 
7
7
  const app = createManagedApplication<HomeController>(
package/build/templates/mvc/src/routes/mvc_settings.ts CHANGED
@@ -1,7 +1,7 @@
1
- export * from "../FuiExports";
2
- export * from "../generated/HostEvents";
1
+ export * from "../fui/FuiExports";
2
+ export * from "../host/generated/HostEvents";
3
3
 
4
- import { Node, createManagedApplication } from "../Fui";
4
+ import { Node, createManagedApplication } from "../fui/Fui";
5
5
  import { SettingsController } from "./mvc/pages/settings/SettingsController";
6
6
 
7
7
  const app = createManagedApplication<SettingsController>(
package/dist/scripts/sync-templates.js CHANGED
@@ -26,7 +26,7 @@ function rewriteSdkImportsInFile(filePath, templateSrcRoot) {
26
26
  const original = readFileSync(filePath, "utf8");
27
27
  const rewritten = original
28
28
  .replace(/(['"])(?:\.\.\/)+src\/(Fui|FuiExports|FuiPrimitives|FuiBrowser)\1/g, (_full, quote, symbolName) => {
29
- const targetPath = join(templateSrcRoot, `${symbolName}.ts`);
29
+ const targetPath = join(templateSrcRoot, "fui", `${symbolName}.ts`);
30
30
  const relativeSpecifier = posixRelativeImport(filePath, targetPath);
31
31
  return `${quote}${relativeSpecifier}${quote}`;
32
32
  })
@@ -47,11 +47,11 @@ function walkFiles(root, callback) {
47
47
  }
48
48
  }
49
49
  function writeSharedSdkShims(templateRoot) {
50
- const srcRoot = join(templateRoot, "src");
51
- writeTextFile(join(srcRoot, "Fui.ts"), 'export * from "../node_modules/@effindomv2/fui-as/src/Fui";\n');
52
- writeTextFile(join(srcRoot, "FuiExports.ts"), 'export * from "../node_modules/@effindomv2/fui-as/src/FuiExports";\n');
53
- writeTextFile(join(srcRoot, "FuiPrimitives.ts"), 'export * from "../node_modules/@effindomv2/fui-as/src/FuiPrimitives";\n');
54
- writeTextFile(join(srcRoot, "FuiBrowser.ts"), 'export * from "../node_modules/@effindomv2/fui-as/browser/src/index";\n');
50
+ const fuiRoot = join(templateRoot, "src", "fui");
51
+ writeTextFile(join(fuiRoot, "Fui.ts"), 'export * from "../../node_modules/@effindomv2/fui-as/src/Fui";\n');
52
+ writeTextFile(join(fuiRoot, "FuiExports.ts"), 'export * from "../../node_modules/@effindomv2/fui-as/src/FuiExports";\n');
53
+ writeTextFile(join(fuiRoot, "FuiPrimitives.ts"), 'export * from "../../node_modules/@effindomv2/fui-as/src/FuiPrimitives";\n');
54
+ writeTextFile(join(fuiRoot, "FuiBrowser.ts"), 'export * from "../../node_modules/@effindomv2/fui-as/browser/src/index";\n');
55
55
  }
56
56
  function writeAsconfig(templateRoot) {
57
57
  writeTextFile(join(templateRoot, "asconfig.json"), JSON.stringify({
@@ -151,10 +151,10 @@ for (const filePath of expectedFiles) {
151
151
  "build:assets": "tsx scripts/prepare-runtime.ts",
152
152
  "build:wasm": "asc src/App.ts --config asconfig.json --target release",
153
153
  "build:harness": "esbuild harness.ts --bundle --format=esm --platform=browser --outfile=public/harness.js",
154
- "generate:host-services": "tsx ./node_modules/@effindomv2/fui-as/scripts/generate-host-services.ts src/host/host-services.ts appHostServices src/generated/HostServices.ts ../FuiPrimitives",
155
- "generate:host-events": "tsx ./node_modules/@effindomv2/fui-as/scripts/generate-host-events.ts src/host/host-events.ts appHostEvents src/generated/HostEvents.ts ../FuiPrimitives",
154
+ "generate:host-services": "tsx ./node_modules/@effindomv2/fui-as/scripts/generate-host-services.ts src/host/host-services.ts appHostServices src/host/generated/HostServices.ts ../../fui/FuiPrimitives",
155
+ "generate:host-events": "tsx ./node_modules/@effindomv2/fui-as/scripts/generate-host-events.ts src/host/host-events.ts appHostEvents src/host/generated/HostEvents.ts ../../fui/FuiPrimitives",
156
156
  "generate:host": "npm run generate:host-services && npm run generate:host-events",
157
- watch: 'chokidar "src/**/*.ts" "harness.ts" "index.html" "asconfig.json" -c "npm run build"',
157
+ watch: 'chokidar "src/**/*.ts" "harness.ts" "index.html" "asconfig.json" --ignore "src/host/generated/**" -c "npm run build"',
158
158
  serve: "http-server public -p 8080 -c-1",
159
159
  dev: 'npm run build && concurrently -k -n watch,serve "npm run watch" "npm run serve"',
160
160
  test: "npm run build && tsx scripts/smoke.ts",
@@ -222,10 +222,10 @@ for (const filePath of expectedFiles) {
222
222
  "build:wasm:home": "asc src/routes/mvc_home.ts --config asconfig.json --target release --outFile public/mvc-home.wasm",
223
223
  "build:wasm:settings": "asc src/routes/mvc_settings.ts --config asconfig.json --target release --outFile public/mvc-settings.wasm",
224
224
  "build:harness": "esbuild harness.ts --bundle --format=esm --platform=browser --outfile=public/harness.js",
225
- "generate:host-services": "tsx ./node_modules/@effindomv2/fui-as/scripts/generate-host-services.ts src/host/host-services.ts appHostServices src/generated/HostServices.ts ../FuiPrimitives",
226
- "generate:host-events": "tsx ./node_modules/@effindomv2/fui-as/scripts/generate-host-events.ts src/host/host-events.ts appHostEvents src/generated/HostEvents.ts ../FuiPrimitives",
225
+ "generate:host-services": "tsx ./node_modules/@effindomv2/fui-as/scripts/generate-host-services.ts src/host/host-services.ts appHostServices src/host/generated/HostServices.ts ../../fui/FuiPrimitives",
226
+ "generate:host-events": "tsx ./node_modules/@effindomv2/fui-as/scripts/generate-host-events.ts src/host/host-events.ts appHostEvents src/host/generated/HostEvents.ts ../../fui/FuiPrimitives",
227
227
  "generate:host": "npm run generate:host-services && npm run generate:host-events",
228
- watch: 'chokidar "src/**/*.ts" "harness.ts" "route-shell.html" "index.html" "asconfig.json" -c "npm run build"',
228
+ watch: 'chokidar "src/**/*.ts" "harness.ts" "route-shell.html" "index.html" "asconfig.json" --ignore "src/host/generated/**" -c "npm run build"',
229
229
  serve: "http-server public -p 8080 -c-1",
230
230
  dev: 'npm run build && concurrently -k -n watch,serve "npm run watch" "npm run serve"',
231
231
  test: "npm run build && tsx scripts/smoke.ts",
@@ -266,8 +266,8 @@ function syncHelloTemplate() {
266
266
  }
267
267
  });
268
268
  rewriteHarnessImports(join(templateRoot, "harness.ts"));
269
- normalizeGeneratedHeader(join(templateSrcRoot, "generated", "HostEvents.ts"), "the scaffold host-events definition");
270
- normalizeGeneratedHeader(join(templateSrcRoot, "generated", "HostServices.ts"), "the scaffold host-services definition");
269
+ normalizeGeneratedHeader(join(templateSrcRoot, "host", "generated", "HostEvents.ts"), "the scaffold host-events definition");
270
+ normalizeGeneratedHeader(join(templateSrcRoot, "host", "generated", "HostServices.ts"), "the scaffold host-services definition");
271
271
  }
272
272
  function syncMvcTemplate() {
273
273
  const templateRoot = join(TEMPLATES_ROOT, "mvc");
@@ -287,8 +287,8 @@ function syncMvcTemplate() {
287
287
  }
288
288
  });
289
289
  rewriteHarnessImports(join(templateRoot, "harness.ts"));
290
- normalizeGeneratedHeader(join(templateSrcRoot, "generated", "HostEvents.ts"), "the scaffold host-events definition");
291
- normalizeGeneratedHeader(join(templateSrcRoot, "generated", "HostServices.ts"), "the scaffold host-services definition");
290
+ normalizeGeneratedHeader(join(templateSrcRoot, "host", "generated", "HostEvents.ts"), "the scaffold host-events definition");
291
+ normalizeGeneratedHeader(join(templateSrcRoot, "host", "generated", "HostServices.ts"), "the scaffold host-services definition");
292
292
  }
293
293
  rmSync(TEMPLATES_ROOT, { recursive: true, force: true });
294
294
  rmSync(LEGACY_TEMPLATES_ROOT, { recursive: true, force: true });
package/dist/tests/scaffold.test.js CHANGED
@@ -21,8 +21,11 @@ test("createProject writes hello-world scaffold including AssemblyScript tsconfi
21
21
  assert.equal(typeof packageJson.scripts.test, "string");
22
22
  assert.equal(typeof packageJson.scripts["generate:host"], "string");
23
23
  assert.equal(readFileSync(join(target, "src", "HelloWorld.ts"), "utf8").includes("Hello world"), true);
24
+ assert.equal(readFileSync(join(target, "src", "fui", "Fui.ts"), "utf8").includes("@effindomv2/fui-as/src/Fui"), true);
24
25
  assert.equal(readFileSync(join(target, "src", "host", "host-events.ts"), "utf8").includes("appHostEvents"), true);
25
26
  assert.equal(readFileSync(join(target, "src", "host", "host-services.ts"), "utf8").includes("appHostServices"), true);
27
+ assert.equal(readFileSync(join(target, "src", "host", "generated", "HostEvents.ts"), "utf8").includes("onAppClockTick"), true);
28
+ assert.equal(readFileSync(join(target, "src", "host", "generated", "HostServices.ts"), "utf8").includes("appClockNowUnixSeconds"), true);
26
29
  }
27
30
  finally {
28
31
  rmSync(root, { recursive: true, force: true });
@@ -44,6 +47,9 @@ test("createProject writes mvc scaffold when template is mvc", () => {
44
47
  assert.equal(readFileSync(join(target, "src", "routes", "mvc", "pages", "home", "HomeController.ts"), "utf8").includes("HomeController"), true);
45
48
  assert.equal(readFileSync(join(target, "src", "host", "host-events.ts"), "utf8").includes("appHostEvents"), true);
46
49
  assert.equal(readFileSync(join(target, "src", "host", "host-services.ts"), "utf8").includes("appHostServices"), true);
50
+ assert.equal(readFileSync(join(target, "src", "fui", "Fui.ts"), "utf8").includes("@effindomv2/fui-as/src/Fui"), true);
51
+ assert.equal(readFileSync(join(target, "src", "host", "generated", "HostEvents.ts"), "utf8").includes("onAppClockTick"), true);
52
+ assert.equal(readFileSync(join(target, "src", "host", "generated", "HostServices.ts"), "utf8").includes("appClockNowUnixSeconds"), true);
47
53
  assert.equal(readFileSync(join(target, "route-shell.html"), "utf8").includes("FUI-AS MVC Demo"), true);
48
54
  }
49
55
  finally {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@effindomv2/create-fui-as-app",
3
- "version": "0.1.4",
3
+ "version": "0.1.5",
4
4
  "private": false,
5
5
  "license": "MIT",
6
6
  "description": "Scaffold a minimal EffinDom v2 FUI-AS app",
package/build/templates/hello/src/Fui.ts DELETED
@@ -1 +0,0 @@
1
- export * from "../node_modules/@effindomv2/fui-as/src/Fui";
package/build/templates/hello/src/FuiBrowser.ts DELETED
@@ -1 +0,0 @@
1
- export * from "../node_modules/@effindomv2/fui-as/browser/src/index";
package/build/templates/hello/src/FuiExports.ts DELETED
@@ -1 +0,0 @@
1
- export * from "../node_modules/@effindomv2/fui-as/src/FuiExports";
package/build/templates/hello/src/FuiPrimitives.ts DELETED
@@ -1 +0,0 @@
1
- export * from "../node_modules/@effindomv2/fui-as/src/FuiPrimitives";
package/build/templates/mvc/src/Fui.ts DELETED
@@ -1 +0,0 @@
1
- export * from "../node_modules/@effindomv2/fui-as/src/Fui";
package/build/templates/mvc/src/FuiBrowser.ts DELETED
@@ -1 +0,0 @@
1
- export * from "../node_modules/@effindomv2/fui-as/browser/src/index";
package/build/templates/mvc/src/FuiExports.ts DELETED
@@ -1 +0,0 @@
1
- export * from "../node_modules/@effindomv2/fui-as/src/FuiExports";
package/build/templates/mvc/src/FuiPrimitives.ts DELETED
@@ -1 +0,0 @@
1
- export * from "../node_modules/@effindomv2/fui-as/src/FuiPrimitives";