synthos 0.8.0 → 0.9.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 +1 -1
- package/default-pages/application/page.html +42 -0
- package/default-pages/application/page.json +10 -0
- package/default-pages/elevenlabs_effects_studio/page.html +1363 -0
- package/default-pages/elevenlabs_effects_studio/page.json +11 -0
- package/default-pages/elevenlabs_voice_studio/page.html +801 -0
- package/default-pages/elevenlabs_voice_studio/page.json +11 -0
- package/default-pages/{json_tools.html → json_tools/page.html} +13 -11
- package/default-pages/json_tools/page.json +10 -0
- package/default-pages/my_notes/notes/a1b2c3d4-e5f6-7890-abcd-ef1234567890.json +5 -0
- package/default-pages/my_notes/page.html +132 -0
- package/default-pages/{my_notes.json → my_notes/page.json} +2 -2
- package/default-pages/neon_asteroids/files/Ambient_Space.mp3 +0 -0
- package/default-pages/neon_asteroids/files/Ambient_Space2.mp3 +0 -0
- package/default-pages/neon_asteroids/files/Ambient_Space3.mp3 +0 -0
- package/default-pages/neon_asteroids/files/Asteroid_Explosion.mp3 +0 -0
- package/default-pages/neon_asteroids/files/Hyperspace_Jump.mp3 +0 -0
- package/default-pages/neon_asteroids/files/Laser_Fire.mp3 +0 -0
- package/default-pages/neon_asteroids/files/Menu_Navigate.mp3 +0 -0
- package/default-pages/neon_asteroids/files/Power_Up_Collect.mp3 +0 -0
- package/default-pages/neon_asteroids/files/Saucer_Alert.mp3 +0 -0
- package/default-pages/neon_asteroids/files/Ship_Thrust.mp3 +0 -0
- package/default-pages/neon_asteroids/files/effects.json +74 -0
- package/default-pages/neon_asteroids/page.html +1822 -0
- package/default-pages/{neon_asteroids.json → neon_asteroids/page.json} +3 -3
- package/default-pages/{oregon_trail.html → oregon_trail/page.html} +14 -12
- package/default-pages/{oregon_trail.json → oregon_trail/page.json} +2 -2
- package/default-pages/retro_game_starter/page.html +1308 -0
- package/default-pages/retro_game_starter/page.json +12 -0
- package/default-pages/{sidebar_page.html → sidebar_page/page.html} +12 -10
- package/default-pages/sidebar_page/page.json +10 -0
- package/default-pages/{solar_explorer.html → solar_explorer/page.html} +14 -11
- package/default-pages/{solar_explorer.json → solar_explorer/page.json} +2 -2
- package/default-pages/{solar_tutorial.html → solar_tutorial/page.html} +12 -10
- package/default-pages/solar_tutorial/page.json +10 -0
- package/default-pages/{two-panel_page.html → two-panel_page/page.html} +13 -11
- package/default-pages/two-panel_page/page.json +10 -0
- package/default-pages/{us_map.html → us_map/page.html} +193 -192
- package/default-pages/{us_map.json → us_map/page.json} +12 -12
- package/default-pages/{us_map_1850.html → us_map_1850/page.html} +326 -325
- package/default-pages/{us_map_1850.json → us_map_1850/page.json} +12 -12
- package/default-pages/{western_cities_1850.html → western_cities_1850/page.html} +527 -526
- package/default-pages/{western_cities_1850.json → western_cities_1850/page.json} +12 -12
- package/default-themes/aurora-dawn.json +19 -0
- package/default-themes/aurora-dawn.v3.css +198 -0
- package/default-themes/aurora-dusk.json +19 -0
- package/default-themes/aurora-dusk.v3.css +200 -0
- package/default-themes/cosmos-dawn.json +19 -0
- package/default-themes/cosmos-dawn.v3.css +198 -0
- package/default-themes/cosmos-dusk.json +19 -0
- package/default-themes/cosmos-dusk.v3.css +200 -0
- package/default-themes/high-contrast-dark.json +19 -0
- package/default-themes/high-contrast-dark.v3.css +200 -0
- package/default-themes/high-contrast-light.json +19 -0
- package/default-themes/high-contrast-light.v3.css +198 -0
- package/default-themes/nebula-dawn.v2.css +110 -0
- package/default-themes/nebula-dawn.v3.css +199 -0
- package/default-themes/nebula-dusk.v2.css +104 -0
- package/default-themes/nebula-dusk.v3.css +201 -0
- package/default-themes/solar-flare-dawn.json +19 -0
- package/default-themes/solar-flare-dawn.v3.css +198 -0
- package/default-themes/solar-flare-dusk.json +19 -0
- package/default-themes/solar-flare-dusk.v3.css +200 -0
- package/dist/agents/index.d.ts +1 -1
- package/dist/agents/index.d.ts.map +1 -1
- package/dist/agents/index.js +2 -1
- package/dist/agents/index.js.map +1 -1
- package/dist/agents/openclaw/gatewayManager.d.ts +4 -0
- package/dist/agents/openclaw/gatewayManager.d.ts.map +1 -1
- package/dist/agents/openclaw/gatewayManager.js +27 -11
- package/dist/agents/openclaw/gatewayManager.js.map +1 -1
- package/dist/agents/openclaw/openclawProvider.d.ts.map +1 -1
- package/dist/agents/openclaw/openclawProvider.js +2 -4
- package/dist/agents/openclaw/openclawProvider.js.map +1 -1
- package/dist/agents/openclaw/sshTunnelManager.d.ts +2 -0
- package/dist/agents/openclaw/sshTunnelManager.d.ts.map +1 -1
- package/dist/agents/openclaw/sshTunnelManager.js +31 -12
- package/dist/agents/openclaw/sshTunnelManager.js.map +1 -1
- package/dist/builders/anthropic.d.ts +31 -0
- package/dist/builders/anthropic.d.ts.map +1 -0
- package/dist/builders/anthropic.js +227 -0
- package/dist/builders/anthropic.js.map +1 -0
- package/dist/builders/fireworksai.d.ts +9 -0
- package/dist/builders/fireworksai.d.ts.map +1 -0
- package/dist/builders/fireworksai.js +57 -0
- package/dist/builders/fireworksai.js.map +1 -0
- package/dist/builders/index.d.ts +13 -0
- package/dist/builders/index.d.ts.map +1 -0
- package/dist/builders/index.js +31 -0
- package/dist/builders/index.js.map +1 -0
- package/dist/builders/openai.d.ts +8 -0
- package/dist/builders/openai.d.ts.map +1 -0
- package/dist/builders/openai.js +87 -0
- package/dist/builders/openai.js.map +1 -0
- package/dist/builders/types.d.ts +54 -0
- package/dist/builders/types.d.ts.map +1 -0
- package/dist/builders/types.js +211 -0
- package/dist/builders/types.js.map +1 -0
- package/dist/connectors/index.d.ts.map +1 -1
- package/dist/connectors/index.js +3 -2
- package/dist/connectors/index.js.map +1 -1
- package/dist/connectors/registry.d.ts +2 -1
- package/dist/connectors/registry.d.ts.map +1 -1
- package/dist/connectors/registry.js +31 -8
- package/dist/connectors/registry.js.map +1 -1
- package/dist/customizer/Customizer.d.ts +57 -0
- package/dist/customizer/Customizer.d.ts.map +1 -0
- package/dist/customizer/Customizer.js +124 -0
- package/dist/customizer/Customizer.js.map +1 -0
- package/dist/customizer/index.d.ts.map +1 -0
- package/dist/customizer/index.js +9 -0
- package/dist/customizer/index.js.map +1 -0
- package/dist/files.d.ts +16 -0
- package/dist/files.d.ts.map +1 -1
- package/dist/files.js +60 -1
- package/dist/files.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/init.d.ts +10 -6
- package/dist/init.d.ts.map +1 -1
- package/dist/init.js +96 -113
- package/dist/init.js.map +1 -1
- package/dist/migrations.d.ts.map +1 -1
- package/dist/migrations.js +23 -10
- package/dist/migrations.js.map +1 -1
- package/dist/models/anthropic.d.ts +4 -2
- package/dist/models/anthropic.d.ts.map +1 -1
- package/dist/models/anthropic.js +33 -6
- package/dist/models/anthropic.js.map +1 -1
- package/dist/models/fireworksai.d.ts.map +1 -1
- package/dist/models/fireworksai.js +9 -1
- package/dist/models/fireworksai.js.map +1 -1
- package/dist/models/index.d.ts +1 -1
- package/dist/models/index.d.ts.map +1 -1
- package/dist/models/index.js +2 -1
- package/dist/models/index.js.map +1 -1
- package/dist/models/openai.d.ts +1 -1
- package/dist/models/openai.d.ts.map +1 -1
- package/dist/models/openai.js +24 -3
- package/dist/models/openai.js.map +1 -1
- package/dist/models/types.d.ts +20 -1
- package/dist/models/types.d.ts.map +1 -1
- package/dist/models/types.js +6 -1
- package/dist/models/types.js.map +1 -1
- package/dist/pages.d.ts +30 -7
- package/dist/pages.d.ts.map +1 -1
- package/dist/pages.js +177 -55
- package/dist/pages.js.map +1 -1
- package/dist/service/server.d.ts.map +1 -1
- package/dist/service/server.js +37 -8
- package/dist/service/server.js.map +1 -1
- package/dist/service/transformPage.d.ts +47 -20
- package/dist/service/transformPage.d.ts.map +1 -1
- package/dist/service/transformPage.js +514 -293
- package/dist/service/transformPage.js.map +1 -1
- package/dist/service/useAgentRoutes.d.ts +2 -1
- package/dist/service/useAgentRoutes.d.ts.map +1 -1
- package/dist/service/useAgentRoutes.js +5 -2
- package/dist/service/useAgentRoutes.js.map +1 -1
- package/dist/service/useApiRoutes.d.ts.map +1 -1
- package/dist/service/useApiRoutes.js +237 -136
- package/dist/service/useApiRoutes.js.map +1 -1
- package/dist/service/useConnectorRoutes.js +6 -6
- package/dist/service/useConnectorRoutes.js.map +1 -1
- package/dist/service/useFileRoutes.d.ts +4 -0
- package/dist/service/useFileRoutes.d.ts.map +1 -0
- package/dist/service/useFileRoutes.js +122 -0
- package/dist/service/useFileRoutes.js.map +1 -0
- package/dist/service/usePageRoutes.d.ts.map +1 -1
- package/dist/service/usePageRoutes.js +648 -67
- package/dist/service/usePageRoutes.js.map +1 -1
- package/dist/service/useSharedDataRoutes.d.ts +4 -0
- package/dist/service/useSharedDataRoutes.d.ts.map +1 -0
- package/dist/service/useSharedDataRoutes.js +104 -0
- package/dist/service/useSharedDataRoutes.js.map +1 -0
- package/dist/service/useSharedFileRoutes.d.ts +4 -0
- package/dist/service/useSharedFileRoutes.d.ts.map +1 -0
- package/dist/service/useSharedFileRoutes.js +121 -0
- package/dist/service/useSharedFileRoutes.js.map +1 -0
- package/dist/settings.d.ts +1 -0
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +1 -0
- package/dist/settings.js.map +1 -1
- package/dist/synthos-cli.d.ts.map +1 -1
- package/dist/synthos-cli.js +4 -3
- package/dist/synthos-cli.js.map +1 -1
- package/dist/themes.d.ts +1 -0
- package/dist/themes.d.ts.map +1 -1
- package/dist/themes.js +28 -15
- package/dist/themes.js.map +1 -1
- package/migration-rules/v1-to-v2.md +193 -0
- package/migration-rules/v2-to-v3.md +481 -0
- package/package.json +11 -10
- package/required-pages/builder/page.html +43 -0
- package/required-pages/builder/page.json +10 -0
- package/required-pages/{pages.html → pages/page.html} +238 -233
- package/required-pages/pages/page.json +10 -0
- package/required-pages/{settings.html → settings/page.html} +389 -275
- package/required-pages/settings/page.json +10 -0
- package/required-pages/synthos_apis/page.html +846 -0
- package/required-pages/synthos_apis/page.json +10 -0
- package/required-pages/{synthos_scripts.html → synthos_scripts/page.html} +13 -11
- package/required-pages/synthos_scripts/page.json +10 -0
- package/src/agents/index.ts +1 -1
- package/src/agents/openclaw/gatewayManager.ts +22 -11
- package/src/agents/openclaw/openclawProvider.ts +2 -4
- package/src/agents/openclaw/sshTunnelManager.ts +19 -11
- package/src/builders/anthropic.ts +283 -0
- package/src/builders/fireworksai.ts +59 -0
- package/src/builders/index.ts +33 -0
- package/src/builders/openai.ts +89 -0
- package/src/builders/types.ts +261 -0
- package/src/connectors/index.ts +1 -1
- package/src/connectors/registry.ts +28 -8
- package/src/customizer/Customizer.ts +151 -0
- package/src/customizer/index.ts +5 -0
- package/src/files.ts +57 -0
- package/src/index.ts +2 -1
- package/src/init.ts +137 -123
- package/src/migrations.ts +30 -10
- package/src/models/anthropic.ts +40 -10
- package/src/models/fireworksai.ts +9 -2
- package/src/models/index.ts +1 -1
- package/src/models/openai.ts +26 -6
- package/src/models/types.ts +31 -1
- package/src/pages.ts +176 -54
- package/src/service/server.ts +36 -9
- package/src/service/transformPage.ts +557 -326
- package/src/service/useAgentRoutes.ts +7 -2
- package/src/service/useApiRoutes.ts +150 -41
- package/src/service/useConnectorRoutes.ts +7 -7
- package/src/service/useFileRoutes.ts +127 -0
- package/src/service/usePageRoutes.ts +720 -73
- package/src/service/useSharedDataRoutes.ts +106 -0
- package/src/service/useSharedFileRoutes.ts +126 -0
- package/src/settings.ts +2 -0
- package/src/synthos-cli.ts +4 -3
- package/src/themes.ts +25 -14
- package/static-files/favicon.svg +12 -0
- package/static-files/fluentlm-instructions.llmd +868 -0
- package/static-files/fluentlm-instructions.md +1595 -0
- package/static-files/fluentlm.css +4844 -0
- package/static-files/fluentlm.js +3602 -0
- package/static-files/fluentlm.min.css +1 -0
- package/static-files/fluentlm.min.js +1 -0
- package/{page-scripts/helpers-v2.js → static-files/helpers.v3.js} +82 -0
- package/static-files/page.v3.js +1290 -0
- package/static-files/recommended-frameworks.llmd +81 -0
- package/static-files/recommended-frameworks.md +137 -0
- package/static-files/retro-game.js +877 -0
- package/static-files/shell.css +797 -0
- package/static-files/theme-dark.css +169 -0
- package/static-files/theme-light.css +169 -0
- package/tests/builders.spec.ts +139 -0
- package/tests/pages.spec.ts +8 -8
- package/tests/transformPage.spec.ts +299 -360
- package/default-pages/application.html +0 -40
- package/default-pages/application.json +0 -1
- package/default-pages/json_tools.json +0 -1
- package/default-pages/my_notes.html +0 -33
- package/default-pages/neon_asteroids.html +0 -77
- package/default-pages/sidebar_page.json +0 -1
- package/default-pages/solar_tutorial.json +0 -1
- package/default-pages/two-panel_page.json +0 -1
- package/dist/agents/a2a/a2aProvider.d.ts +0 -3
- package/dist/agents/discovery.d.ts +0 -30
- package/dist/agents/openclaw/openclawProvider.d.ts +0 -3
- package/dist/agents/types.d.ts +0 -64
- package/dist/connectors/index.d.ts +0 -3
- package/dist/connectors/types.d.ts +0 -84
- package/dist/index.d.ts +0 -7
- package/dist/migrations.d.ts +0 -12
- package/dist/models/chainOfThought.d.ts +0 -12
- package/dist/models/fireworksai.d.ts +0 -30
- package/dist/models/logCompletePrompt.d.ts +0 -3
- package/dist/models/providers.d.ts +0 -8
- package/dist/models/utils.d.ts +0 -6
- package/dist/scripts.d.ts +0 -15
- package/dist/service/createCompletePrompt.d.ts +0 -5
- package/dist/service/debugLog.d.ts +0 -11
- package/dist/service/generateImage.d.ts +0 -32
- package/dist/service/index.d.ts +0 -8
- package/dist/service/modelInstructions.d.ts +0 -7
- package/dist/service/requiresSettings.d.ts +0 -3
- package/dist/service/server.d.ts +0 -4
- package/dist/service/useApiRoutes.d.ts +0 -4
- package/dist/service/useConnectorRoutes.d.ts +0 -4
- package/dist/service/useDataRoutes.d.ts +0 -4
- package/dist/service/useGatewayRoutes.d.ts +0 -4
- package/dist/service/useGatewayRoutes.d.ts.map +0 -1
- package/dist/service/useGatewayRoutes.js +0 -168
- package/dist/service/useGatewayRoutes.js.map +0 -1
- package/dist/service/usePageRoutes.d.ts +0 -5
- package/dist/synthos-cli.d.ts +0 -2
- package/page-scripts/page-v2.js +0 -656
- package/required-pages/builder.html +0 -48
- package/required-pages/builder.json +0 -1
- package/required-pages/pages.json +0 -1
- package/required-pages/settings.json +0 -1
- package/required-pages/synthos_apis.html +0 -327
- package/required-pages/synthos_apis.json +0 -1
- package/required-pages/synthos_scripts.json +0 -1
- package/src/connectors/airtable/connector.json +0 -27
- package/src/connectors/alpha-vantage/connector.json +0 -26
- package/src/connectors/brave-search/connector.json +0 -26
- package/src/connectors/cloudinary/connector.json +0 -27
- package/src/connectors/deepl/connector.json +0 -28
- package/src/connectors/elevenlabs/connector.json +0 -30
- package/src/connectors/giphy/connector.json +0 -27
- package/src/connectors/github/connector.json +0 -29
- package/src/connectors/huggingface/connector.json +0 -27
- package/src/connectors/imgur/connector.json +0 -29
- package/src/connectors/instagram/connector.json +0 -43
- package/src/connectors/jira/connector.json +0 -28
- package/src/connectors/mapbox/connector.json +0 -26
- package/src/connectors/nasa/connector.json +0 -27
- package/src/connectors/newsapi/connector.json +0 -27
- package/src/connectors/notion/connector.json +0 -28
- package/src/connectors/open-exchange-rates/connector.json +0 -27
- package/src/connectors/openweathermap/connector.json +0 -26
- package/src/connectors/pexels/connector.json +0 -27
- package/src/connectors/resend/connector.json +0 -29
- package/src/connectors/rss2json/connector.json +0 -27
- package/src/connectors/sendgrid/connector.json +0 -27
- package/src/connectors/spoonacular/connector.json +0 -28
- package/src/connectors/stability-ai/connector.json +0 -27
- package/src/connectors/twilio/connector.json +0 -28
- package/src/connectors/unsplash/connector.json +0 -27
- package/src/connectors/wolfram-alpha/connector.json +0 -26
- package/src/connectors/youtube-data/connector.json +0 -30
- /package/{dist/connectors → service-connectors}/airtable/connector.json +0 -0
- /package/{dist/connectors → service-connectors}/alpha-vantage/connector.json +0 -0
- /package/{dist/connectors → service-connectors}/brave-search/connector.json +0 -0
- /package/{dist/connectors → service-connectors}/cloudinary/connector.json +0 -0
- /package/{dist/connectors → service-connectors}/deepl/connector.json +0 -0
- /package/{dist/connectors → service-connectors}/elevenlabs/connector.json +0 -0
- /package/{dist/connectors → service-connectors}/giphy/connector.json +0 -0
- /package/{dist/connectors → service-connectors}/github/connector.json +0 -0
- /package/{dist/connectors → service-connectors}/huggingface/connector.json +0 -0
- /package/{dist/connectors → service-connectors}/imgur/connector.json +0 -0
- /package/{dist/connectors → service-connectors}/instagram/connector.json +0 -0
- /package/{dist/connectors → service-connectors}/jira/connector.json +0 -0
- /package/{dist/connectors → service-connectors}/mapbox/connector.json +0 -0
- /package/{dist/connectors → service-connectors}/nasa/connector.json +0 -0
- /package/{dist/connectors → service-connectors}/newsapi/connector.json +0 -0
- /package/{dist/connectors → service-connectors}/notion/connector.json +0 -0
- /package/{dist/connectors → service-connectors}/open-exchange-rates/connector.json +0 -0
- /package/{dist/connectors → service-connectors}/openweathermap/connector.json +0 -0
- /package/{dist/connectors → service-connectors}/pexels/connector.json +0 -0
- /package/{dist/connectors → service-connectors}/resend/connector.json +0 -0
- /package/{dist/connectors → service-connectors}/rss2json/connector.json +0 -0
- /package/{dist/connectors → service-connectors}/sendgrid/connector.json +0 -0
- /package/{dist/connectors → service-connectors}/spoonacular/connector.json +0 -0
- /package/{dist/connectors → service-connectors}/stability-ai/connector.json +0 -0
- /package/{dist/connectors → service-connectors}/twilio/connector.json +0 -0
- /package/{dist/connectors → service-connectors}/unsplash/connector.json +0 -0
- /package/{dist/connectors → service-connectors}/wolfram-alpha/connector.json +0 -0
- /package/{dist/connectors → service-connectors}/youtube-data/connector.json +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anthropic.js","sourceRoot":"","sources":["../../src/models/anthropic.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"anthropic.js","sourceRoot":"","sources":["../../src/models/anthropic.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fireworksai.d.ts","sourceRoot":"","sources":["../../src/models/fireworksai.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,cAAc,EAAE,oBAAoB,
|
|
1
|
+
{"version":3,"file":"fireworksai.d.ts","sourceRoot":"","sources":["../../src/models/fireworksai.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,cAAc,EAAE,oBAAoB,EAAqC,MAAM,SAAS,CAAC;AAEnH,MAAM,WAAW,eAAe;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AAWD;;;GAGG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CA+BhD;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,GAAG;IACpF,QAAQ,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC9C,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;CACpB,CA4BA;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,eAAe,GAAG,cAAc,CAyCjE"}
|
|
@@ -84,7 +84,15 @@ function buildFireworksRequest(args, defaultTemp) {
|
|
|
84
84
|
messages.push({ role: msg.role, content: msg.content });
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
|
-
|
|
87
|
+
// Strip images — FireworksAI has no vision support; keep text only
|
|
88
|
+
const promptContent = args.prompt.content;
|
|
89
|
+
let userContent;
|
|
90
|
+
if ((0, types_1.isMultimodalContent)(promptContent)) {
|
|
91
|
+
userContent = promptContent.filter(b => b.type === 'text').map(b => b.text).join('\n');
|
|
92
|
+
}
|
|
93
|
+
else {
|
|
94
|
+
userContent = promptContent;
|
|
95
|
+
}
|
|
88
96
|
if (useJson) {
|
|
89
97
|
userContent += '\n\nRespond with valid JSON only. No markdown fences.';
|
|
90
98
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fireworksai.js","sourceRoot":"","sources":["../../src/models/fireworksai.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"fireworksai.js","sourceRoot":"","sources":["../../src/models/fireworksai.ts"],"names":[],"mappings":"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"}
|
package/dist/models/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export { ProviderName, ProviderConfig, ModelEntry, Provider, SystemMessage, UserMessage, Message, AgentCompletion, completePrompt, PromptCompletionArgs, AgentArgs, RequestError } from './types';
|
|
1
|
+
export { ProviderName, ProviderConfig, ModelEntry, Provider, SystemMessage, UserMessage, Message, AgentCompletion, completePrompt, PromptCompletionArgs, AgentArgs, RequestError, TextBlock, ImageBlock, ContentBlock, MessageContent, isMultimodalContent } from './types';
|
|
2
2
|
export { AnthropicProvider, OpenAIProvider, PROVIDERS, getProvider, detectProvider } from './providers';
|
|
3
3
|
export { anthropic, AnthropicArgs, buildAnthropicRequest } from './anthropic';
|
|
4
4
|
export { openai, OpenaiArgs, buildOpenAIRequest } from './openai';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/models/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAE,WAAW,EAAE,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,oBAAoB,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/models/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAE,WAAW,EAAE,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,oBAAoB,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,YAAY,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAC5Q,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,SAAS,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AACxG,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAC9E,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAC3G,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC"}
|
package/dist/models/index.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.variableToString = exports.logCompletePrompt = exports.chainOfThought = exports.buildFireworksRequest = exports.resolveFireworksModel = exports.fireworksai = exports.buildOpenAIRequest = exports.openai = exports.buildAnthropicRequest = exports.anthropic = exports.detectProvider = exports.getProvider = exports.PROVIDERS = exports.OpenAIProvider = exports.AnthropicProvider = exports.RequestError = void 0;
|
|
3
|
+
exports.variableToString = exports.logCompletePrompt = exports.chainOfThought = exports.buildFireworksRequest = exports.resolveFireworksModel = exports.fireworksai = exports.buildOpenAIRequest = exports.openai = exports.buildAnthropicRequest = exports.anthropic = exports.detectProvider = exports.getProvider = exports.PROVIDERS = exports.OpenAIProvider = exports.AnthropicProvider = exports.isMultimodalContent = exports.RequestError = void 0;
|
|
4
4
|
var types_1 = require("./types");
|
|
5
5
|
Object.defineProperty(exports, "RequestError", { enumerable: true, get: function () { return types_1.RequestError; } });
|
|
6
|
+
Object.defineProperty(exports, "isMultimodalContent", { enumerable: true, get: function () { return types_1.isMultimodalContent; } });
|
|
6
7
|
var providers_1 = require("./providers");
|
|
7
8
|
Object.defineProperty(exports, "AnthropicProvider", { enumerable: true, get: function () { return providers_1.AnthropicProvider; } });
|
|
8
9
|
Object.defineProperty(exports, "OpenAIProvider", { enumerable: true, get: function () { return providers_1.OpenAIProvider; } });
|
package/dist/models/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/models/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/models/index.ts"],"names":[],"mappings":";;;AAAA,iCAA4Q;AAAxG,qGAAA,YAAY,OAAA;AAAuD,4GAAA,mBAAmB,OAAA;AAC1P,yCAAwG;AAA/F,8GAAA,iBAAiB,OAAA;AAAE,2GAAA,cAAc,OAAA;AAAE,sGAAA,SAAS,OAAA;AAAE,wGAAA,WAAW,OAAA;AAAE,2GAAA,cAAc,OAAA;AAClF,yCAA8E;AAArE,sGAAA,SAAS,OAAA;AAAiB,kHAAA,qBAAqB,OAAA;AACxD,mCAAkE;AAAzD,gGAAA,MAAM,OAAA;AAAc,4GAAA,kBAAkB,OAAA;AAC/C,6CAA2G;AAAlG,0GAAA,WAAW,OAAA;AAAmB,oHAAA,qBAAqB,OAAA;AAAE,oHAAA,qBAAqB,OAAA;AACnF,mDAAuF;AAA9E,gHAAA,cAAc,OAAA;AACvB,yDAAwD;AAA/C,sHAAA,iBAAiB,OAAA;AAC1B,iCAA2C;AAAlC,yGAAA,gBAAgB,OAAA"}
|
package/dist/models/openai.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../src/models/openai.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,cAAc,EAAE,oBAAoB,
|
|
1
|
+
{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../src/models/openai.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,cAAc,EAAE,oBAAoB,EAAqC,MAAM,SAAS,CAAC;AAEnH,MAAM,WAAW,UAAU;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,oBAAoB,GAAG;IAC5D,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,GAAG,GAAG,EAAE,CAAA;KAAE,EAAE,CAAC;IACnD,IAAI,CAAC,EAAE;QAAE,MAAM,EAAE,GAAG,CAAA;KAAE,CAAC;CAC1B,CAwDA;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,cAAc,CAgCvD"}
|
package/dist/models/openai.js
CHANGED
|
@@ -17,13 +17,34 @@ function buildOpenAIRequest(args) {
|
|
|
17
17
|
input.push({ role: msg.role, content: msg.content });
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
|
-
|
|
20
|
+
// Build user content — multimodal when ContentBlock[] is provided
|
|
21
|
+
const promptContent = args.prompt.content;
|
|
22
|
+
if ((0, types_1.isMultimodalContent)(promptContent)) {
|
|
23
|
+
const parts = promptContent.map(block => {
|
|
24
|
+
if (block.type === 'text') {
|
|
25
|
+
return { type: 'input_text', text: block.text };
|
|
26
|
+
}
|
|
27
|
+
return {
|
|
28
|
+
type: 'input_image',
|
|
29
|
+
image_url: `data:${block.mediaType};base64,${block.data}`,
|
|
30
|
+
};
|
|
31
|
+
});
|
|
32
|
+
input.push({ role: 'user', content: parts });
|
|
33
|
+
}
|
|
34
|
+
else {
|
|
35
|
+
input.push({ role: 'user', content: promptContent });
|
|
36
|
+
}
|
|
21
37
|
if (args.jsonMode || args.jsonSchema) {
|
|
22
|
-
const inputText = input.map(m => m.content).join(' ');
|
|
38
|
+
const inputText = input.map(m => typeof m.content === 'string' ? m.content : '').join(' ');
|
|
23
39
|
if (!/json/i.test(inputText)) {
|
|
24
40
|
const last = input[input.length - 1];
|
|
25
41
|
if (last) {
|
|
26
|
-
last.content
|
|
42
|
+
if (typeof last.content === 'string') {
|
|
43
|
+
last.content += '\nReturn JSON.';
|
|
44
|
+
}
|
|
45
|
+
else if (Array.isArray(last.content)) {
|
|
46
|
+
last.content.push({ type: 'input_text', text: '\nReturn JSON.' });
|
|
47
|
+
}
|
|
27
48
|
}
|
|
28
49
|
}
|
|
29
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../src/models/openai.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../src/models/openai.ts"],"names":[],"mappings":"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"}
|
package/dist/models/types.d.ts
CHANGED
|
@@ -17,6 +17,19 @@ export interface Provider {
|
|
|
17
17
|
chatModels: string[];
|
|
18
18
|
detectModel(model: string): boolean;
|
|
19
19
|
}
|
|
20
|
+
export interface TextBlock {
|
|
21
|
+
type: 'text';
|
|
22
|
+
text: string;
|
|
23
|
+
}
|
|
24
|
+
export interface ImageBlock {
|
|
25
|
+
type: 'image';
|
|
26
|
+
mediaType: string;
|
|
27
|
+
data: string;
|
|
28
|
+
}
|
|
29
|
+
export type ContentBlock = TextBlock | ImageBlock;
|
|
30
|
+
export type MessageContent = string | ContentBlock[];
|
|
31
|
+
/** Type guard: returns true when content is a multimodal ContentBlock array. */
|
|
32
|
+
export declare function isMultimodalContent(content: MessageContent): content is ContentBlock[];
|
|
20
33
|
export interface Message {
|
|
21
34
|
role: string;
|
|
22
35
|
content: string;
|
|
@@ -25,8 +38,10 @@ export interface Message {
|
|
|
25
38
|
export interface SystemMessage extends Message {
|
|
26
39
|
role: 'system';
|
|
27
40
|
}
|
|
28
|
-
export interface UserMessage
|
|
41
|
+
export interface UserMessage {
|
|
29
42
|
role: 'user';
|
|
43
|
+
content: MessageContent;
|
|
44
|
+
name?: string;
|
|
30
45
|
}
|
|
31
46
|
export interface AgentCompletion<TValue> {
|
|
32
47
|
completed: boolean;
|
|
@@ -41,6 +56,10 @@ export interface PromptCompletionArgs {
|
|
|
41
56
|
jsonMode?: boolean;
|
|
42
57
|
/** JSON schema for structured output. When provided, the model is asked to return JSON conforming to this schema. */
|
|
43
58
|
jsonSchema?: Record<string, unknown>;
|
|
59
|
+
/** When true, system content is wrapped with cache_control for Anthropic prompt caching. */
|
|
60
|
+
cacheSystem?: boolean;
|
|
61
|
+
/** JSON schema for structured output via constrained decoding (Anthropic output_config). */
|
|
62
|
+
outputSchema?: Record<string, unknown>;
|
|
44
63
|
}
|
|
45
64
|
export type completePrompt<TValue = string> = (args: PromptCompletionArgs) => Promise<AgentCompletion<TValue>>;
|
|
46
65
|
export interface AgentArgs {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/models/types.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,YAAY,GAAG,WAAW,GAAG,QAAQ,GAAG,aAAa,CAAC;AAElE,MAAM,WAAW,cAAc;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,UAAU;IACvB,GAAG,EAAE,SAAS,GAAG,MAAM,CAAC;IACxB,QAAQ,EAAE,YAAY,CAAC;IACvB,aAAa,EAAE,cAAc,CAAC;IAC9B,YAAY,EAAE,UAAU,GAAG,IAAI,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,QAAQ;IACrB,IAAI,EAAE,YAAY,CAAC;IACnB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;CACvC;AAMD,MAAM,WAAW,OAAO;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,aAAc,SAAQ,OAAO;IAC1C,IAAI,EAAE,QAAQ,CAAC;CAClB;AAED,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/models/types.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,YAAY,GAAG,WAAW,GAAG,QAAQ,GAAG,aAAa,CAAC;AAElE,MAAM,WAAW,cAAc;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,UAAU;IACvB,GAAG,EAAE,SAAS,GAAG,MAAM,CAAC;IACxB,QAAQ,EAAE,YAAY,CAAC;IACvB,aAAa,EAAE,cAAc,CAAC;IAC9B,YAAY,EAAE,UAAU,GAAG,IAAI,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,QAAQ;IACrB,IAAI,EAAE,YAAY,CAAC;IACnB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;CACvC;AAMD,MAAM,WAAW,SAAS;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,UAAU;IACvB,IAAI,EAAE,OAAO,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,UAAU,CAAC;AAElD,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,YAAY,EAAE,CAAC;AAErD,gFAAgF;AAChF,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,IAAI,YAAY,EAAE,CAEtF;AAMD,MAAM,WAAW,OAAO;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,aAAc,SAAQ,OAAO;IAC1C,IAAI,EAAE,QAAQ,CAAC;CAClB;AAED,MAAM,WAAW,WAAW;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,cAAc,CAAC;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAMD,MAAM,WAAW,eAAe,CAAC,MAAM;IACnC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,KAAK,CAAC;CACjB;AAED,MAAM,WAAW,oBAAoB;IACjC,MAAM,EAAE,WAAW,CAAC;IACpB,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,qHAAqH;IACrH,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,4FAA4F;IAC5F,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,4FAA4F;IAC5F,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC1C;AAED,MAAM,MAAM,cAAc,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,oBAAoB,KAAK,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;AAM/G,MAAM,WAAW,SAAS;IACtB,cAAc,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;CACvC;AAMD,qBAAa,YAAa,SAAQ,KAAK;IACnC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;gBAEZ,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;CAK7D"}
|
package/dist/models/types.js
CHANGED
|
@@ -3,7 +3,12 @@
|
|
|
3
3
|
// Provider types
|
|
4
4
|
// ---------------------------------------------------------------------------
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.RequestError = void 0;
|
|
6
|
+
exports.RequestError = exports.isMultimodalContent = void 0;
|
|
7
|
+
/** Type guard: returns true when content is a multimodal ContentBlock array. */
|
|
8
|
+
function isMultimodalContent(content) {
|
|
9
|
+
return Array.isArray(content);
|
|
10
|
+
}
|
|
11
|
+
exports.isMultimodalContent = isMultimodalContent;
|
|
7
12
|
// ---------------------------------------------------------------------------
|
|
8
13
|
// Errors
|
|
9
14
|
// ---------------------------------------------------------------------------
|
package/dist/models/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/models/types.ts"],"names":[],"mappings":";AAAA,8EAA8E;AAC9E,iBAAiB;AACjB,8EAA8E;;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/models/types.ts"],"names":[],"mappings":";AAAA,8EAA8E;AAC9E,iBAAiB;AACjB,8EAA8E;;;AA4C9E,gFAAgF;AAChF,SAAgB,mBAAmB,CAAC,OAAuB;IACvD,OAAO,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;AAClC,CAAC;AAFD,kDAEC;AAwDD,8EAA8E;AAC9E,SAAS;AACT,8EAA8E;AAE9E,MAAa,YAAa,SAAQ,KAAK;IAC1B,MAAM,CAAS;IAExB,YAAY,OAAe,EAAE,MAAc,EAAE,IAAa;QACtD,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,cAAc,CAAC;IACvC,CAAC;CACJ;AARD,oCAQC"}
|
package/dist/pages.d.ts
CHANGED
|
@@ -1,5 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
/**
|
|
2
|
+
* Derive the list of required page names by scanning *.html files
|
|
3
|
+
* across one or more requiredPages folders.
|
|
4
|
+
*/
|
|
5
|
+
export declare function getRequiredPages(requiredPagesFolders: string[]): Promise<string[]>;
|
|
6
|
+
export declare const PAGE_VERSION = 3;
|
|
3
7
|
export interface PageInfo {
|
|
4
8
|
name: string;
|
|
5
9
|
title: string;
|
|
@@ -12,14 +16,33 @@ export interface PageInfo {
|
|
|
12
16
|
mode: 'unlocked' | 'locked';
|
|
13
17
|
}
|
|
14
18
|
export type PageMetadata = Omit<PageInfo, 'name'>;
|
|
15
|
-
export declare function loadPageMetadata(pagesFolder: string, name: string,
|
|
19
|
+
export declare function loadPageMetadata(pagesFolder: string, name: string, fallbackFolders?: string[]): Promise<PageMetadata | undefined>;
|
|
16
20
|
export declare function parseMetadata(parsed: Record<string, unknown>): PageMetadata;
|
|
17
21
|
export declare function savePageMetadata(pagesFolder: string, name: string, metadata: PageMetadata): Promise<void>;
|
|
18
|
-
export declare function listPages(pagesFolder: string,
|
|
19
|
-
export declare function loadPageState(pagesFolder: string, name: string
|
|
22
|
+
export declare function listPages(pagesFolder: string, fallbackPagesFolders: string[]): Promise<PageInfo[]>;
|
|
23
|
+
export declare function loadPageState(pagesFolder: string, name: string): Promise<string | undefined>;
|
|
20
24
|
export declare function normalizePageName(name: string | undefined): string | undefined;
|
|
21
25
|
export declare function savePageState(pagesFolder: string, name: string, content: string, title?: string, categories?: string[]): Promise<void>;
|
|
22
|
-
export declare function updatePageState(name: string, content: string): void;
|
|
23
26
|
export declare function deletePage(pagesFolder: string, name: string): Promise<void>;
|
|
24
|
-
|
|
27
|
+
/**
|
|
28
|
+
* Save a version snapshot: <pagesFolder>/pages/<name>/page.v<version>.html
|
|
29
|
+
*/
|
|
30
|
+
export declare function savePageVersion(pagesFolder: string, name: string, version: number, html: string): Promise<void>;
|
|
31
|
+
/**
|
|
32
|
+
* Load a version snapshot (returns undefined if the file doesn't exist).
|
|
33
|
+
*/
|
|
34
|
+
export declare function loadPageVersion(pagesFolder: string, name: string, version: number): Promise<string | undefined>;
|
|
35
|
+
/**
|
|
36
|
+
* Scan page.v*.html files and return the highest version number (0 if none).
|
|
37
|
+
*/
|
|
38
|
+
export declare function getLatestVersion(pagesFolder: string, name: string): Promise<number>;
|
|
39
|
+
/**
|
|
40
|
+
* Delete all page.v*.html version files for a page.
|
|
41
|
+
*/
|
|
42
|
+
export declare function clearVersions(pagesFolder: string, name: string): Promise<void>;
|
|
43
|
+
export interface CopyPageOptions {
|
|
44
|
+
copyTables?: boolean;
|
|
45
|
+
copyFiles?: boolean;
|
|
46
|
+
}
|
|
47
|
+
export declare function copyPage(pagesFolder: string, sourceName: string, targetName: string, title: string, categories: string[], requiredPagesFolders: string[], options?: CopyPageOptions): Promise<void>;
|
|
25
48
|
//# sourceMappingURL=pages.d.ts.map
|
package/dist/pages.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pages.d.ts","sourceRoot":"","sources":["../src/pages.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pages.d.ts","sourceRoot":"","sources":["../src/pages.ts"],"names":[],"mappings":"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"}
|
package/dist/pages.js
CHANGED
|
@@ -3,15 +3,35 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.copyPage = exports.
|
|
6
|
+
exports.copyPage = exports.clearVersions = exports.getLatestVersion = exports.loadPageVersion = exports.savePageVersion = exports.deletePage = exports.savePageState = exports.normalizePageName = exports.loadPageState = exports.listPages = exports.savePageMetadata = exports.parseMetadata = exports.loadPageMetadata = exports.PAGE_VERSION = exports.getRequiredPages = void 0;
|
|
7
7
|
const files_1 = require("./files");
|
|
8
8
|
const path_1 = __importDefault(require("path"));
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
async function
|
|
14
|
-
|
|
9
|
+
/**
|
|
10
|
+
* Derive the list of required page names by scanning *.html files
|
|
11
|
+
* across one or more requiredPages folders.
|
|
12
|
+
*/
|
|
13
|
+
async function getRequiredPages(requiredPagesFolders) {
|
|
14
|
+
const result = [];
|
|
15
|
+
const seen = new Set();
|
|
16
|
+
for (const folder of requiredPagesFolders) {
|
|
17
|
+
if (!await (0, files_1.checkIfExists)(folder))
|
|
18
|
+
continue;
|
|
19
|
+
const entries = await (0, files_1.listFolders)(folder);
|
|
20
|
+
for (const entry of entries) {
|
|
21
|
+
if (seen.has(entry))
|
|
22
|
+
continue;
|
|
23
|
+
if (await (0, files_1.checkIfExists)(path_1.default.join(folder, entry, 'page.html'))) {
|
|
24
|
+
seen.add(entry);
|
|
25
|
+
result.push(entry);
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
return result;
|
|
30
|
+
}
|
|
31
|
+
exports.getRequiredPages = getRequiredPages;
|
|
32
|
+
exports.PAGE_VERSION = 3;
|
|
33
|
+
async function loadPageMetadata(pagesFolder, name, fallbackFolders) {
|
|
34
|
+
// 1. Try user override: <localFolder>/pages/<name>/page.json
|
|
15
35
|
const metadataPath = path_1.default.join(pagesFolder, 'pages', name, 'page.json');
|
|
16
36
|
if (await (0, files_1.checkIfExists)(metadataPath)) {
|
|
17
37
|
try {
|
|
@@ -23,17 +43,19 @@ async function loadPageMetadata(pagesFolder, name, fallbackFolder) {
|
|
|
23
43
|
// fall through
|
|
24
44
|
}
|
|
25
45
|
}
|
|
26
|
-
// 2. Try fallback: fallbackFolder/<name
|
|
27
|
-
if (
|
|
28
|
-
const
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
46
|
+
// 2. Try fallback folders: fallbackFolder/<name>/page.json
|
|
47
|
+
if (fallbackFolders) {
|
|
48
|
+
for (const folder of fallbackFolders) {
|
|
49
|
+
const candidate = path_1.default.join(folder, name, 'page.json');
|
|
50
|
+
if (await (0, files_1.checkIfExists)(candidate)) {
|
|
51
|
+
try {
|
|
52
|
+
const raw = await (0, files_1.loadFile)(candidate);
|
|
53
|
+
const parsed = JSON.parse(raw);
|
|
54
|
+
return parseMetadata(parsed);
|
|
55
|
+
}
|
|
56
|
+
catch {
|
|
57
|
+
// fall through
|
|
58
|
+
}
|
|
37
59
|
}
|
|
38
60
|
}
|
|
39
61
|
}
|
|
@@ -70,7 +92,7 @@ const DEFAULT_METADATA = {
|
|
|
70
92
|
pageVersion: 0,
|
|
71
93
|
mode: 'unlocked',
|
|
72
94
|
};
|
|
73
|
-
async function listPages(pagesFolder,
|
|
95
|
+
async function listPages(pagesFolder, fallbackPagesFolders) {
|
|
74
96
|
const pageMap = new Map();
|
|
75
97
|
// Folder-based pages under pages/ subdirectory
|
|
76
98
|
const pagesSubdir = path_1.default.join(pagesFolder, 'pages');
|
|
@@ -112,13 +134,18 @@ async function listPages(pagesFolder, fallbackPagesFolder) {
|
|
|
112
134
|
});
|
|
113
135
|
}
|
|
114
136
|
}
|
|
115
|
-
// Add pages from fallback (required) pages
|
|
116
|
-
const
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
137
|
+
// Add pages from fallback (required) pages folders
|
|
138
|
+
for (const folder of fallbackPagesFolders) {
|
|
139
|
+
if (!await (0, files_1.checkIfExists)(folder))
|
|
140
|
+
continue;
|
|
141
|
+
const dirs = await (0, files_1.listFolders)(folder);
|
|
142
|
+
for (const name of dirs) {
|
|
143
|
+
if (pageMap.has(name))
|
|
144
|
+
continue;
|
|
145
|
+
if (!await (0, files_1.checkIfExists)(path_1.default.join(folder, name, 'page.html')))
|
|
146
|
+
continue;
|
|
147
|
+
// System page not yet in map — check for user override, then fallback page.json
|
|
148
|
+
const metadata = await loadPageMetadata(pagesFolder, name, fallbackPagesFolders);
|
|
122
149
|
pageMap.set(name, {
|
|
123
150
|
name,
|
|
124
151
|
title: metadata?.title ?? '',
|
|
@@ -138,22 +165,28 @@ async function listPages(pagesFolder, fallbackPagesFolder) {
|
|
|
138
165
|
return entries;
|
|
139
166
|
}
|
|
140
167
|
exports.listPages = listPages;
|
|
141
|
-
async function loadPageState(pagesFolder, name
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
const
|
|
146
|
-
if (
|
|
147
|
-
|
|
148
|
-
}
|
|
149
|
-
else if (await (0, files_1.checkIfExists)(flatPath)) {
|
|
150
|
-
_pages[name] = await (0, files_1.loadFile)(flatPath);
|
|
151
|
-
}
|
|
152
|
-
else {
|
|
153
|
-
return undefined;
|
|
154
|
-
}
|
|
168
|
+
async function loadPageState(pagesFolder, name) {
|
|
169
|
+
// Check for working-state version files first
|
|
170
|
+
const latestVersion = await getLatestVersion(pagesFolder, name);
|
|
171
|
+
if (latestVersion > 0) {
|
|
172
|
+
const versionHtml = await loadPageVersion(pagesFolder, name, latestVersion);
|
|
173
|
+
if (versionHtml)
|
|
174
|
+
return versionHtml;
|
|
155
175
|
}
|
|
156
|
-
|
|
176
|
+
// Fall back to saved baseline
|
|
177
|
+
const folderPath = path_1.default.join(pagesFolder, 'pages', name, 'page.html');
|
|
178
|
+
const directFolderPath = path_1.default.join(pagesFolder, name, 'page.html');
|
|
179
|
+
const flatPath = path_1.default.join(pagesFolder, `${name}.html`);
|
|
180
|
+
if (await (0, files_1.checkIfExists)(folderPath)) {
|
|
181
|
+
return (0, files_1.loadFile)(folderPath);
|
|
182
|
+
}
|
|
183
|
+
else if (await (0, files_1.checkIfExists)(directFolderPath)) {
|
|
184
|
+
return (0, files_1.loadFile)(directFolderPath);
|
|
185
|
+
}
|
|
186
|
+
else if (await (0, files_1.checkIfExists)(flatPath)) {
|
|
187
|
+
return (0, files_1.loadFile)(flatPath);
|
|
188
|
+
}
|
|
189
|
+
return undefined;
|
|
157
190
|
}
|
|
158
191
|
exports.loadPageState = loadPageState;
|
|
159
192
|
function normalizePageName(name) {
|
|
@@ -161,7 +194,6 @@ function normalizePageName(name) {
|
|
|
161
194
|
}
|
|
162
195
|
exports.normalizePageName = normalizePageName;
|
|
163
196
|
async function savePageState(pagesFolder, name, content, title, categories) {
|
|
164
|
-
_pages[name] = content;
|
|
165
197
|
const pageFolder = path_1.default.join(pagesFolder, 'pages', name);
|
|
166
198
|
await (0, files_1.ensureFolderExists)(pageFolder);
|
|
167
199
|
await (0, files_1.saveFile)(path_1.default.join(pageFolder, 'page.html'), content);
|
|
@@ -183,10 +215,6 @@ async function savePageState(pagesFolder, name, content, title, categories) {
|
|
|
183
215
|
}
|
|
184
216
|
}
|
|
185
217
|
exports.savePageState = savePageState;
|
|
186
|
-
function updatePageState(name, content) {
|
|
187
|
-
_pages[name] = content;
|
|
188
|
-
}
|
|
189
|
-
exports.updatePageState = updatePageState;
|
|
190
218
|
async function deletePage(pagesFolder, name) {
|
|
191
219
|
// Delete folder-based page: <pagesFolder>/pages/<name>/
|
|
192
220
|
const folderPath = path_1.default.join(pagesFolder, 'pages', name);
|
|
@@ -198,17 +226,93 @@ async function deletePage(pagesFolder, name) {
|
|
|
198
226
|
if (await (0, files_1.checkIfExists)(flatPath)) {
|
|
199
227
|
await (0, files_1.deleteFile)(flatPath);
|
|
200
228
|
}
|
|
201
|
-
// Clear in-memory cache
|
|
202
|
-
delete _pages[name];
|
|
203
229
|
}
|
|
204
230
|
exports.deletePage = deletePage;
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
231
|
+
// ---------------------------------------------------------------------------
|
|
232
|
+
// Page versioning — per-edit version snapshots for undo support
|
|
233
|
+
// ---------------------------------------------------------------------------
|
|
234
|
+
/**
|
|
235
|
+
* Save a version snapshot: <pagesFolder>/pages/<name>/page.v<version>.html
|
|
236
|
+
*/
|
|
237
|
+
async function savePageVersion(pagesFolder, name, version, html) {
|
|
238
|
+
const pageFolder = path_1.default.join(pagesFolder, 'pages', name);
|
|
239
|
+
await (0, files_1.ensureFolderExists)(pageFolder);
|
|
240
|
+
await (0, files_1.saveFile)(path_1.default.join(pageFolder, `page.v${version}.html`), html);
|
|
241
|
+
}
|
|
242
|
+
exports.savePageVersion = savePageVersion;
|
|
243
|
+
/**
|
|
244
|
+
* Load a version snapshot (returns undefined if the file doesn't exist).
|
|
245
|
+
*/
|
|
246
|
+
async function loadPageVersion(pagesFolder, name, version) {
|
|
247
|
+
const filePath = path_1.default.join(pagesFolder, 'pages', name, `page.v${version}.html`);
|
|
248
|
+
if (!await (0, files_1.checkIfExists)(filePath))
|
|
249
|
+
return undefined;
|
|
250
|
+
return (0, files_1.loadFile)(filePath);
|
|
251
|
+
}
|
|
252
|
+
exports.loadPageVersion = loadPageVersion;
|
|
253
|
+
/**
|
|
254
|
+
* Scan page.v*.html files and return the highest version number (0 if none).
|
|
255
|
+
*/
|
|
256
|
+
async function getLatestVersion(pagesFolder, name) {
|
|
257
|
+
const pageFolder = path_1.default.join(pagesFolder, 'pages', name);
|
|
258
|
+
if (!await (0, files_1.checkIfExists)(pageFolder))
|
|
259
|
+
return 0;
|
|
260
|
+
const files = await (0, files_1.listFiles)(pageFolder);
|
|
261
|
+
let max = 0;
|
|
262
|
+
for (const file of files) {
|
|
263
|
+
const match = file.match(/^page\.v(\d+)\.html$/);
|
|
264
|
+
if (match) {
|
|
265
|
+
const v = parseInt(match[1], 10);
|
|
266
|
+
if (v > max)
|
|
267
|
+
max = v;
|
|
268
|
+
}
|
|
269
|
+
}
|
|
270
|
+
return max;
|
|
271
|
+
}
|
|
272
|
+
exports.getLatestVersion = getLatestVersion;
|
|
273
|
+
/**
|
|
274
|
+
* Delete all page.v*.html version files for a page.
|
|
275
|
+
*/
|
|
276
|
+
async function clearVersions(pagesFolder, name) {
|
|
277
|
+
const pageFolder = path_1.default.join(pagesFolder, 'pages', name);
|
|
278
|
+
if (!await (0, files_1.checkIfExists)(pageFolder))
|
|
279
|
+
return;
|
|
280
|
+
const files = await (0, files_1.listFiles)(pageFolder);
|
|
281
|
+
for (const file of files) {
|
|
282
|
+
if (/^page\.v\d+\.html$/.test(file)) {
|
|
283
|
+
await (0, files_1.deleteFile)(path_1.default.join(pageFolder, file));
|
|
284
|
+
}
|
|
285
|
+
}
|
|
286
|
+
}
|
|
287
|
+
exports.clearVersions = clearVersions;
|
|
288
|
+
async function copyPage(pagesFolder, sourceName, targetName, title, categories, requiredPagesFolders, options) {
|
|
289
|
+
const copyTables = options?.copyTables ?? false;
|
|
290
|
+
const copyFiles = options?.copyFiles ?? true;
|
|
291
|
+
// Resolve source page folder: user pages first, then required pages
|
|
292
|
+
let sourceFolder;
|
|
293
|
+
const userSourceFolder = path_1.default.join(pagesFolder, 'pages', sourceName);
|
|
294
|
+
if (await (0, files_1.checkIfExists)(path_1.default.join(userSourceFolder, 'page.html'))) {
|
|
295
|
+
sourceFolder = userSourceFolder;
|
|
296
|
+
}
|
|
297
|
+
else {
|
|
298
|
+
for (const folder of requiredPagesFolders) {
|
|
299
|
+
const candidate = path_1.default.join(folder, sourceName);
|
|
300
|
+
if (await (0, files_1.checkIfExists)(path_1.default.join(candidate, 'page.html'))) {
|
|
301
|
+
sourceFolder = candidate;
|
|
302
|
+
break;
|
|
303
|
+
}
|
|
304
|
+
}
|
|
305
|
+
}
|
|
306
|
+
// Load source HTML
|
|
307
|
+
let html;
|
|
308
|
+
if (sourceFolder) {
|
|
309
|
+
html = await (0, files_1.loadFile)(path_1.default.join(sourceFolder, 'page.html'));
|
|
310
|
+
}
|
|
311
|
+
else {
|
|
312
|
+
// Try legacy flat file
|
|
313
|
+
const flatPath = path_1.default.join(pagesFolder, `${sourceName}.html`);
|
|
314
|
+
if (await (0, files_1.checkIfExists)(flatPath)) {
|
|
315
|
+
html = await (0, files_1.loadFile)(flatPath);
|
|
212
316
|
}
|
|
213
317
|
}
|
|
214
318
|
if (!html) {
|
|
@@ -229,6 +333,24 @@ async function copyPage(pagesFolder, sourceName, targetName, title, categories,
|
|
|
229
333
|
mode: 'unlocked',
|
|
230
334
|
};
|
|
231
335
|
await savePageMetadata(pagesFolder, targetName, metadata);
|
|
336
|
+
// Copy additional content from source if a folder was resolved
|
|
337
|
+
if (sourceFolder) {
|
|
338
|
+
const targetFolder = path_1.default.join(pagesFolder, 'pages', targetName);
|
|
339
|
+
if (copyTables) {
|
|
340
|
+
const entries = await (0, files_1.listFolders)(sourceFolder);
|
|
341
|
+
for (const entry of entries) {
|
|
342
|
+
if (entry === 'files')
|
|
343
|
+
continue; // handled separately
|
|
344
|
+
await (0, files_1.copyFolderRecursive)(path_1.default.join(sourceFolder, entry), path_1.default.join(targetFolder, entry));
|
|
345
|
+
}
|
|
346
|
+
}
|
|
347
|
+
if (copyFiles) {
|
|
348
|
+
const filesDir = path_1.default.join(sourceFolder, 'files');
|
|
349
|
+
if (await (0, files_1.checkIfExists)(filesDir)) {
|
|
350
|
+
await (0, files_1.copyFolderRecursive)(filesDir, path_1.default.join(targetFolder, 'files'));
|
|
351
|
+
}
|
|
352
|
+
}
|
|
353
|
+
}
|
|
232
354
|
}
|
|
233
355
|
exports.copyPage = copyPage;
|
|
234
356
|
//# sourceMappingURL=pages.js.map
|