tungsten 0.1.59 → 0.1.61

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 (240) hide show
  1. package/dist/AnyComponent.d.ts.map +1 -1
  2. package/dist/ComponentInstance.d.ts +1 -2
  3. package/dist/ComponentInstance.d.ts.map +1 -1
  4. package/dist/ComponentInstance.js +4 -1
  5. package/dist/ComponentRenderInfo.type.d.ts +6 -0
  6. package/dist/ComponentRenderInfo.type.d.ts.map +1 -0
  7. package/dist/ComponentRenderInfo.type.js +1 -0
  8. package/dist/Components.d.ts +18 -2
  9. package/dist/Components.d.ts.map +1 -1
  10. package/dist/Components.js +105 -4
  11. package/dist/ContentNode.d.ts +3 -1
  12. package/dist/ContentNode.d.ts.map +1 -1
  13. package/dist/ContentNode.js +1 -0
  14. package/dist/Framework.d.ts +1 -1
  15. package/dist/Framework.d.ts.map +1 -1
  16. package/dist/Framework.js +42 -25
  17. package/dist/FrameworkConfig.d.ts +20 -4
  18. package/dist/FrameworkConfig.d.ts.map +1 -1
  19. package/dist/FunctionComponent.d.ts +2 -0
  20. package/dist/FunctionComponent.d.ts.map +1 -1
  21. package/dist/FunctionComponentStandIn.d.ts +9 -4
  22. package/dist/FunctionComponentStandIn.d.ts.map +1 -1
  23. package/dist/FunctionComponentStandIn.js +17 -2
  24. package/dist/Instance/Instance.d.ts.map +1 -1
  25. package/dist/Instance/InstanceConfig.d.ts +2 -0
  26. package/dist/Instance/InstanceConfig.d.ts.map +1 -1
  27. package/dist/RenderedContentNode.d.ts +6 -1
  28. package/dist/RenderedContentNode.d.ts.map +1 -1
  29. package/dist/RenderedContentNode.js +2 -2
  30. package/dist/RenderingNode.d.ts +23 -8
  31. package/dist/RenderingNode.d.ts.map +1 -1
  32. package/dist/RenderingNode.js +39 -8
  33. package/dist/Servers/DevServer.d.ts.map +1 -1
  34. package/dist/Servers/DevServer.js +74 -25
  35. package/dist/Servers/ProdServer.d.ts +5 -1
  36. package/dist/Servers/ProdServer.d.ts.map +1 -1
  37. package/dist/Servers/ProdServer.js +49 -33
  38. package/dist/Store/makeStore.d.ts.map +1 -1
  39. package/dist/TungstenApp.d.ts +11 -0
  40. package/dist/TungstenApp.d.ts.map +1 -0
  41. package/dist/TungstenApp.js +46 -0
  42. package/dist/TungstenElement.d.ts +3 -0
  43. package/dist/TungstenElement.d.ts.map +1 -0
  44. package/dist/TungstenElement.js +1 -0
  45. package/dist/_client/client.d.ts +4 -1
  46. package/dist/_client/client.d.ts.map +1 -1
  47. package/dist/_client/client.js +16 -9
  48. package/dist/babelPlugins/BabelTransformBindDirect.d.ts.map +1 -1
  49. package/dist/babelPlugins/BabelTransformBindVar.d.ts.map +1 -1
  50. package/dist/babelPlugins/BabelTransformCjsToEsm.d.ts +1 -1
  51. package/dist/babelPlugins/BabelTransformCjsToEsm.d.ts.map +1 -1
  52. package/dist/babelPlugins/BabelTransformCjsToFunction.d.ts +1 -1
  53. package/dist/babelPlugins/BabelTransformCjsToFunction.d.ts.map +1 -1
  54. package/dist/babelPlugins/BabelTransformCjsToFunction2.d.ts +1 -1
  55. package/dist/babelPlugins/BabelTransformCjsToFunction2.d.ts.map +1 -1
  56. package/dist/babelPlugins/BabelTransformComponentState.d.ts.map +1 -1
  57. package/dist/babelPlugins/BabelTransformComponentStyles.d.ts.map +1 -1
  58. package/dist/babelPlugins/{BabelTransformCssImport.d.ts → BabelTransformCssImports.d.ts} +5 -3
  59. package/dist/babelPlugins/BabelTransformCssImports.d.ts.map +1 -0
  60. package/dist/babelPlugins/BabelTransformCssImports.js +129 -0
  61. package/dist/babelPlugins/BabelTransformDependencyImportsOld.d.ts.map +1 -1
  62. package/dist/babelPlugins/BabelTransformDeproxyState.d.ts.map +1 -1
  63. package/dist/babelPlugins/BabelTransformPackageImports.d.ts.map +1 -1
  64. package/dist/babelPlugins/BabelTransformPackageImports.js +110 -45
  65. package/dist/babelPlugins/BabelTransformReactive.d.ts.map +1 -1
  66. package/dist/babelPlugins/BabelTransformReactiveSvelteStyle.d.ts.map +1 -1
  67. package/dist/babelPlugins/BabelTransformRemoveServerBlocks.d.ts.map +1 -1
  68. package/dist/babelPlugins/BabelTransformRemoveServerBlocks.js +5 -0
  69. package/dist/babelPlugins/BabelTransformRemoveServerCode.d.ts +2 -0
  70. package/dist/babelPlugins/BabelTransformRemoveServerCode.d.ts.map +1 -0
  71. package/dist/babelPlugins/BabelTransformRemoveServerCode.js +1 -0
  72. package/dist/babelPlugins/BabelTransformUniqueComponents.d.ts.map +1 -1
  73. package/dist/babelPlugins/fixImportsInSassErrorMessage.d.ts.map +1 -1
  74. package/dist/babelPlugins/{BabelTransformDependencyImportsCjs.d.ts → transformPackageImports/BabelTransformDependencyImportsCjs.d.ts} +1 -1
  75. package/dist/babelPlugins/transformPackageImports/BabelTransformDependencyImportsCjs.d.ts.map +1 -0
  76. package/dist/babelPlugins/{BabelTransformDependencyImportsCjs.js → transformPackageImports/BabelTransformDependencyImportsCjs.js} +10 -3
  77. package/dist/babelPlugins/{BabelTransformDependencyImportsEsm.d.ts → transformPackageImports/BabelTransformDependencyImportsEsm.d.ts} +1 -1
  78. package/dist/babelPlugins/transformPackageImports/BabelTransformDependencyImportsEsm.d.ts.map +1 -0
  79. package/dist/babelPlugins/transformPackageImports/BabelTransformDependencyImportsEsm.js +112 -0
  80. package/dist/babelPlugins/transformPackageImports/getWebLocationOfPackageFile.d.ts +2 -0
  81. package/dist/babelPlugins/transformPackageImports/getWebLocationOfPackageFile.d.ts.map +1 -0
  82. package/dist/babelPlugins/transformPackageImports/getWebLocationOfPackageFile.js +24 -0
  83. package/dist/bin/commands/compileSimplePackage.d.ts +2 -0
  84. package/dist/bin/commands/compileSimplePackage.d.ts.map +1 -0
  85. package/dist/bin/commands/compileSimplePackage.js +51 -0
  86. package/dist/bin/commands/static.js +2 -2
  87. package/dist/bin/index.d.ts.map +1 -1
  88. package/dist/bin/index.js +5 -0
  89. package/dist/browserStorage.d.ts.map +1 -1
  90. package/dist/build/babel.user.common.config.d.ts.map +1 -1
  91. package/dist/build/babel.user.common.config.js +2 -56
  92. package/dist/build/bundle.d.ts +1 -2
  93. package/dist/build/bundle.d.ts.map +1 -1
  94. package/dist/build/bundle.js +7 -4
  95. package/dist/build/compileJavascript.d.ts.map +1 -1
  96. package/dist/build/compileJavascript.js +23 -11
  97. package/dist/build/compilePackages.d.ts +0 -5
  98. package/dist/build/compilePackages.d.ts.map +1 -1
  99. package/dist/build/compilePackages.js +89 -82
  100. package/dist/build/compileUserApp.d.ts.map +1 -1
  101. package/dist/build/copyPackageModulesToPackagesFolder.d.ts.map +1 -1
  102. package/dist/build/copyPackageModulesToPackagesFolder.js +3 -1
  103. package/dist/build/createClientFiles.d.ts.map +1 -1
  104. package/dist/build/createClientFiles.js +43 -52
  105. package/dist/build/createInstanceConfigFile.d.ts +4 -0
  106. package/dist/build/createInstanceConfigFile.d.ts.map +1 -0
  107. package/dist/build/{createAppConfig.js → createInstanceConfigFile.js} +2 -2
  108. package/dist/build/makeBabelUserDevConfig.d.ts.map +1 -1
  109. package/dist/build/makeBabelUserDevConfig.js +8 -14
  110. package/dist/build/makeBabelUserProdConfig.d.ts.map +1 -1
  111. package/dist/build/makeBabelUserProdConfig.js +4 -5
  112. package/dist/componentProxyHandlers.d.ts.map +1 -1
  113. package/dist/components/Link.d.ts.map +1 -1
  114. package/dist/components/Link.js +1 -1
  115. package/dist/components/Stylesheet.d.ts.map +1 -1
  116. package/dist/components/Stylesheet.js +5 -3
  117. package/dist/createRef.d.ts +4 -2
  118. package/dist/createRef.d.ts.map +1 -1
  119. package/dist/createRef.js +5 -2
  120. package/dist/createRoutes.d.ts +3 -0
  121. package/dist/createRoutes.d.ts.map +1 -0
  122. package/dist/createRoutes.js +3 -0
  123. package/dist/defaultConfig.d.ts +1 -0
  124. package/dist/defaultConfig.d.ts.map +1 -1
  125. package/dist/defaultConfig.js +1 -0
  126. package/dist/findUserConfig.d.ts.map +1 -1
  127. package/dist/findUserConfig.js +1 -1
  128. package/dist/frameworkConfigSchema.d.ts +188 -0
  129. package/dist/frameworkConfigSchema.d.ts.map +1 -0
  130. package/dist/frameworkConfigSchema.js +65 -0
  131. package/dist/getConfig.d.ts +1 -15
  132. package/dist/getConfig.d.ts.map +1 -1
  133. package/dist/getConfig.js +12 -11
  134. package/dist/getRoutes.d.ts.map +1 -1
  135. package/dist/getRoutes.js +20 -15
  136. package/dist/getUserConfig.d.ts +3 -0
  137. package/dist/getUserConfig.d.ts.map +1 -0
  138. package/dist/getUserConfig.js +25 -0
  139. package/dist/hasDomain.d.ts.map +1 -1
  140. package/dist/hooks/getCurrentComponent.d.ts +4 -0
  141. package/dist/hooks/getCurrentComponent.d.ts.map +1 -1
  142. package/dist/hooks/getCurrentComponent.js +8 -2
  143. package/dist/hooks/globalType.d.ts +2 -0
  144. package/dist/hooks/globalType.d.ts.map +1 -0
  145. package/dist/hooks/globalType.js +1 -0
  146. package/dist/hooks/useState.d.ts +1 -1
  147. package/dist/hooks/useState.d.ts.map +1 -1
  148. package/dist/hooks/useState.js +5 -5
  149. package/dist/hydrate/hydrate.d.ts +1 -1
  150. package/dist/hydrate/hydrate.d.ts.map +1 -1
  151. package/dist/hydrate/hydrate.js +159 -53
  152. package/dist/indexInner.d.ts +5 -3
  153. package/dist/indexInner.d.ts.map +1 -1
  154. package/dist/indexInner.js +5 -3
  155. package/dist/jsx-runtime.d.ts +2 -0
  156. package/dist/jsx-runtime.d.ts.map +1 -0
  157. package/dist/jsx-runtime.js +1 -0
  158. package/dist/jsxRuntime.d.ts +1 -1
  159. package/dist/jsxRuntime.d.ts.map +1 -1
  160. package/dist/jsxRuntime.js +10 -2
  161. package/dist/makeFinalConfig.d.ts.map +1 -1
  162. package/dist/makeInstanceConfigFromFrameworkConfig.d.ts +4 -0
  163. package/dist/makeInstanceConfigFromFrameworkConfig.d.ts.map +1 -0
  164. package/dist/makeInstanceConfigFromFrameworkConfig.js +12 -0
  165. package/dist/makeServerRpc.d.ts.map +1 -1
  166. package/dist/nbsp.d.ts +3 -0
  167. package/dist/nbsp.d.ts.map +1 -0
  168. package/dist/nbsp.js +8 -0
  169. package/dist/render/componentNodeToRenderingTree.d.ts +6 -0
  170. package/dist/render/componentNodeToRenderingTree.d.ts.map +1 -0
  171. package/dist/render/componentNodeToRenderingTree.js +41 -0
  172. package/dist/render/contentToHtml.d.ts +9 -0
  173. package/dist/render/contentToHtml.d.ts.map +1 -0
  174. package/dist/render/contentToHtml.js +44 -0
  175. package/dist/render/contentToHtmlDev.d.ts +9 -0
  176. package/dist/render/contentToHtmlDev.d.ts.map +1 -0
  177. package/dist/render/contentToHtmlDev.js +4 -0
  178. package/dist/render/contentTreeToRenderingTree.d.ts.map +1 -1
  179. package/dist/render/contentTreeToRenderingTree.js +8 -8
  180. package/dist/render/functionComponentNodeToRenderingTree.d.ts.map +1 -1
  181. package/dist/render/functionComponentNodeToRenderingTree.js +4 -2
  182. package/dist/render/instantiateClassComponent.d.ts +2 -2
  183. package/dist/render/instantiateClassComponent.d.ts.map +1 -1
  184. package/dist/render/instantiateClassComponent.js +1 -1
  185. package/dist/render/instantiateComponent.d.ts.map +1 -1
  186. package/dist/render/processProps.d.ts.map +1 -1
  187. package/dist/render/processProps.js +1 -1
  188. package/dist/render/renderingTreeToHtml.d.ts.map +1 -1
  189. package/dist/render/renderingTreeToHtml.js +42 -8
  190. package/dist/render/rootToHtml.d.ts +2 -1
  191. package/dist/render/rootToHtml.d.ts.map +1 -1
  192. package/dist/render/rootToHtml.js +12 -6
  193. package/dist/render/rootToHtmlDev.d.ts +4 -3
  194. package/dist/render/rootToHtmlDev.d.ts.map +1 -1
  195. package/dist/render/rootToHtmlDev.js +2 -2
  196. package/dist/routing/MatchedRoute.d.ts.map +1 -1
  197. package/dist/routing/MatchedRoute.js +0 -3
  198. package/dist/routing/runContentFunction.d.ts +2 -0
  199. package/dist/routing/runContentFunction.d.ts.map +1 -0
  200. package/dist/routing/runContentFunction.js +13 -0
  201. package/dist/staticGen/getAppRoutes.d.ts.map +1 -1
  202. package/dist/staticGen/getAppRoutes.js +7 -6
  203. package/dist/staticGen/staticGen.d.ts.map +1 -1
  204. package/dist/staticGen/staticGen.js +9 -1
  205. package/dist/update/integrateUpdateVdom.d.ts +13 -1
  206. package/dist/update/integrateUpdateVdom.d.ts.map +1 -1
  207. package/dist/update/integrateUpdateVdom.js +122 -61
  208. package/dist/update/integrateUpdateVdomPrebuild.d.ts +2 -0
  209. package/dist/update/integrateUpdateVdomPrebuild.d.ts.map +1 -0
  210. package/dist/update/integrateUpdateVdomPrebuild.js +1453 -0
  211. package/dist/validChildren.d.ts +4 -2
  212. package/dist/validChildren.d.ts.map +1 -1
  213. package/dist/validChildren.js +4 -0
  214. package/package.json +51 -45
  215. package/types/jsx/jsx.d.ts +10 -7
  216. package/dist/babelPlugins/BabelTransformCssImport.d.ts.map +0 -1
  217. package/dist/babelPlugins/BabelTransformCssImport.js +0 -80
  218. package/dist/babelPlugins/BabelTransformDependencyImportsCjs.d.ts.map +0 -1
  219. package/dist/babelPlugins/BabelTransformDependencyImportsEsm.d.ts.map +0 -1
  220. package/dist/babelPlugins/BabelTransformDependencyImportsEsm.js +0 -85
  221. package/dist/build/compileEnv.d.ts +0 -2
  222. package/dist/build/compileEnv.d.ts.map +0 -1
  223. package/dist/build/compileEnv.js +0 -132
  224. package/dist/build/createAppConfig.d.ts +0 -4
  225. package/dist/build/createAppConfig.d.ts.map +0 -1
  226. package/dist/build/webpack.user.prod.config.d.ts +0 -2
  227. package/dist/build/webpack.user.prod.config.d.ts.map +0 -1
  228. package/dist/build/webpack.user.prod.config.js +0 -337
  229. package/dist/createInstanceConfigFromFrameworkConfig.d.ts +0 -4
  230. package/dist/createInstanceConfigFromFrameworkConfig.d.ts.map +0 -1
  231. package/dist/createInstanceConfigFromFrameworkConfig.js +0 -9
  232. package/dist/getAppConfig.d.ts +0 -3
  233. package/dist/getAppConfig.d.ts.map +0 -1
  234. package/dist/getAppConfig.js +0 -12
  235. package/dist/render/componentNodeToRenderingToTree.d.ts +0 -6
  236. package/dist/render/componentNodeToRenderingToTree.d.ts.map +0 -1
  237. package/dist/render/componentNodeToRenderingToTree.js +0 -15
  238. package/dist/render/componentNodeToTree.d.ts +0 -5
  239. package/dist/render/componentNodeToTree.d.ts.map +0 -1
  240. package/dist/render/componentNodeToTree.js +0 -16
@@ -2,7 +2,7 @@ import { promises as fsPromises } from 'fs';
2
2
  import { join, dirname } from 'path';
3
3
  import { devBuildFolder, prodBuildFolder } from "../settings.js";
4
4
  import { TungstenError } from "../TungstenError.js";
5
- export async function createAppConfig(config, mode) {
5
+ export async function createInstanceConfigFile(config, mode) {
6
6
  //console.log('creating app config')
7
7
  const specificBuildFolder = mode === 'dev' ? devBuildFolder : prodBuildFolder;
8
8
  const appConfigLocation = join(process.cwd(), specificBuildFolder, '.tungsten.config.js');
@@ -20,7 +20,7 @@ export async function createAppConfig(config, mode) {
20
20
  });
21
21
  await fsPromises.writeFile(appConfigLocation,
22
22
  // to
23
- `export default { prod: ${(mode === 'prod').toString()}, siteBasePath: "${siteBasePath}", clientSideNav: ${config.clientSideNav.toString()}, staticSite: ${config.staticSite.toString()} };` // content
23
+ `export default { prod: ${(mode === 'prod').toString()}, useRootComponent: ${config.useRootComponent.toString()}, siteBasePath: "${siteBasePath}", clientSideNav: ${config.clientSideNav.toString()}, staticSite: ${config.staticSite.toString()} };` // eslint-disable-line max-len
24
24
  );
25
25
  } catch (e) {
26
26
  throw new TungstenError(`createAppConfig() Error: error creating app config file`);
@@ -1 +1 @@
1
- {"version":3,"file":"makeBabelUserDevConfig.d.ts","sourceRoot":"","sources":["../../src/build/makeBabelUserDevConfig.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAInD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAEvD,OAAO,EAAoC,eAAe,EAAkB,MAAM,iDAAiD,CAAA;AAKnI,wBAAgB,sBAAsB,CAClC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,kBAAkB,EAAE,MAAM,EAC1B,kBAAkB,EAAE,eAAe,EACnC,eAAe,EAAE,eAAe,EAGhC,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,GACzB,gBAAgB,CA4BlB"}
1
+ {"version":3,"file":"makeBabelUserDevConfig.d.ts","sourceRoot":"","sources":["../../src/build/makeBabelUserDevConfig.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAKnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAEvD,OAAO,EAAoC,eAAe,EAAE,MAAM,iDAAiD,CAAA;AAMnH,wBAAgB,sBAAsB,CAClC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,kBAAkB,EAAE,MAAM,EAC1B,kBAAkB,EAAE,eAAe,EACnC,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,GACzB,gBAAgB,CAwBlB"}
@@ -5,32 +5,26 @@ import { MakeBabelTransformComponentStyles } from "../babelPlugins/BabelTransfor
5
5
  import { MakeBabelTransformPackageImports } from "../babelPlugins/BabelTransformPackageImports.js";
6
6
  import { devBuildFolder, componentCssFolder, componentCssFile } from "../settings.js";
7
7
  import userCommonConfig from "./babel.user.common.config.js";
8
- import { MakeBabelTransformCssImport } from "../babelPlugins/BabelTransformCssImport.js";
9
- export function makeBabelUserDevConfig(projectDir, absCodeDir, absSourceDir, absStyleImportBase, oldDependencyGraph, dependencyGraph,
10
- //packages: PackageLogList,
11
- //nonEsmPackages: PackageLogList,
12
- importAliases, promises) {
8
+ import { MakeBabelTransformCssImports } from "../babelPlugins/BabelTransformCssImports.js";
9
+ export function makeBabelUserDevConfig(projectDir, absCodeDir, absSourceDir, absStyleImportBase, oldDependencyGraph, dependencyGraph, importAliases, promises) {
13
10
  const userDevConfig = objectCopy(userCommonConfig);
14
- userDevConfig.plugins.push(MakeBabelTransformCssImport({
15
- absCodeDir
16
- }), MakeBabelTransformPackageImports({
11
+ userDevConfig.plugins.push(MakeBabelTransformPackageImports({
17
12
  projectDir: projectDir,
18
13
  codeDir: absCodeDir,
19
14
  oldDependencyGraph,
20
15
  dependencyGraph,
21
- //packages,
22
- //nonEsmPackages,
23
16
  importAliases,
24
17
  promises
18
+ }), MakeBabelTransformCssImports({
19
+ projectDir,
20
+ absSourceDir,
21
+ absCodeDir
25
22
  }), MakeBabelTransformComponentStyles({
26
23
  projectAbsCodeDir: absCodeDir,
27
24
  projectAbsSourceDir: absSourceDir,
28
25
  projectAbsStyleImportDir: absStyleImportBase,
29
26
  classNameFormat: '[folder]-[name]_[local]',
30
- cssOutputFile: join(projectDir, devBuildFolder, componentCssFolder, componentCssFile) // should only need to pass one
31
- //cssModulesOutputDir: join(PROJECT_DIR, devBuildFolder, componentCssFolder, 'individual'), // of these. fix up code later
32
- // seems 'individual' is ignored,
33
- // and only the folder is used
27
+ cssOutputFile: join(projectDir, devBuildFolder, componentCssFolder, componentCssFile)
34
28
  }));
35
29
  return userDevConfig;
36
30
  }
@@ -1 +1 @@
1
- {"version":3,"file":"makeBabelUserProdConfig.d.ts","sourceRoot":"","sources":["../../src/build/makeBabelUserProdConfig.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAOnD,wBAAgB,uBAAuB,CACnC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,kBAAkB,EAAE,MAAM,GAC3B,gBAAgB,CAoBlB"}
1
+ {"version":3,"file":"makeBabelUserProdConfig.d.ts","sourceRoot":"","sources":["../../src/build/makeBabelUserProdConfig.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAMnD,wBAAgB,uBAAuB,CACnC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,kBAAkB,EAAE,MAAM,GAC3B,gBAAgB,CAelB"}
@@ -4,12 +4,14 @@ import { join } from 'path';
4
4
  import { MakeBabelTransformComponentStyles } from "../babelPlugins/BabelTransformComponentStyles.js";
5
5
  import { prodBuildFolder, componentCssFolder, componentCssFile } from "../settings.js";
6
6
  import userCommonConfig from "./babel.user.common.config.js";
7
- import { MakeBabelTransformCssImport } from "../babelPlugins/BabelTransformCssImport.js";
7
+ import { MakeBabelTransformCssImports } from "../babelPlugins/BabelTransformCssImports.js";
8
8
  export function makeBabelUserProdConfig(projectDir, absCodeDir, absSourceDir, absStyleImportBase) {
9
9
  const userProdConfig = objectCopy(userCommonConfig);
10
10
  userProdConfig.plugins.push(
11
11
  // eslint-disable-line @typescript-eslint/no-non-null-assertion
12
- MakeBabelTransformCssImport({
12
+ MakeBabelTransformCssImports({
13
+ projectDir,
14
+ absSourceDir,
13
15
  absCodeDir
14
16
  }), MakeBabelTransformComponentStyles({
15
17
  projectAbsCodeDir: absCodeDir,
@@ -17,9 +19,6 @@ export function makeBabelUserProdConfig(projectDir, absCodeDir, absSourceDir, ab
17
19
  projectAbsStyleImportDir: absStyleImportBase,
18
20
  classNameFormat: '[folder]-[name]_[local]',
19
21
  cssOutputFile: join(projectDir, prodBuildFolder, componentCssFolder, componentCssFile) // should only need to pass one
20
- //cssModulesOutputDir: join(PROJECT_DIR, devBuildFolder, componentCssFolder, 'individual'), // of these. fix up code later
21
- // seems 'individual' is ignored,
22
- // and only the folder is used
23
22
  }));
24
23
  return userProdConfig;
25
24
  }
@@ -1 +1 @@
1
- {"version":3,"file":"componentProxyHandlers.d.ts","sourceRoot":"","sources":["../src/componentProxyHandlers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,yBAAyB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAS/E,KAAK,0BAA0B,CAAC,KAAK,SAAS,MAAM,IAC9C,yBAAyB,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,GAC1C,iBAAiB,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,CAAA;AAExC,KAAK,oBAAoB,GAAG,yBAAyB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;AAEvG,eAAO,MAAM,SAAS,eAAqB,CAAA;AAC3C,eAAO,MAAM,UAAU,eAAsB,CAAA;AAE7C,eAAO,MAAM,oBAAoB,GAAI,KAAK,SAAS,MAAM,WAC/C,0BAA0B,CAAC,KAAK,CAAC;eAC5B,KAAK,OAAO,MAAM,GAAG,MAAM;eAQ3B,KAAK,OAAO,MAAM,GAAG,MAAM,SAAS,OAAO;0BAmChC,KAAK,OAAO,MAAM,GAAG,MAAM;aAOxC,KAAK,OAAO,MAAM,GAAG,MAAM;CAItC,CAAA;AAGF,eAAO,MAAM,0BAA0B,GAAI,CAAC,SAAS,MAAM,WAAW,oBAAoB;eAC3E,CAAC,OAAO,MAAM,GAAG,MAAM;eAKvB,CAAC,OAAO,MAAM,GAAG,MAAM,SAAS,OAAO;0BAkC5B,CAAC,OAAO,MAAM,GAAG,MAAM;aAOpC,CAAC,OAAO,MAAM,GAAG,MAAM;CAIlC,CAAA;AAGF,eAAO,MAAM,yBAAyB,YAAa,oBAAoB;eACxD,OAAO,EAAE,OAAO,MAAM,GAAG,MAAM;eAwB/B,OAAO,EAAE,OAAO,MAAM,GAAG,MAAM,SAAS,OAAO;aA6BjD,OAAO,EAAE,OAAO,MAAM,GAAG,MAAM;CAI1C,CAAA;AAIF,eAAO,MAAM,uBAAuB,YAAa,oBAAoB;eACtD,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,MAAM,GAAG,MAAM;aA+C7C,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,MAAM,GAAG,MAAM;CAItD,CAAA;AAIF,eAAO,MAAM,uBAAuB,YAAa,oBAAoB;eACtD,GAAG,CAAC,OAAO,CAAC,OAAO,MAAM,GAAG,MAAM;aA0CpC,GAAG,CAAC,OAAO,CAAC,OAAO,MAAM,GAAG,MAAM;CAI7C,CAAA;AAgCF,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,MAAM,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,EAAE,CAAC,GAAG,IAAI,CAkCnG;AAED,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,OAAO,EAAE,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,CAkCpG"}
1
+ {"version":3,"file":"componentProxyHandlers.d.ts","sourceRoot":"","sources":["../src/componentProxyHandlers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,yBAAyB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAS/E,KAAK,0BAA0B,CAAC,KAAK,SAAS,MAAM,IAC9C,yBAAyB,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,GAC1C,iBAAiB,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,CAAA;AAExC,KAAK,oBAAoB,GAAG,yBAAyB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;AAEvG,eAAO,MAAM,SAAS,eAAqB,CAAA;AAC3C,eAAO,MAAM,UAAU,eAAsB,CAAA;AAE7C,eAAO,MAAM,oBAAoB,GAAI,KAAK,SAAS,MAAM,EACxD,SAAS,0BAA0B,CAAC,KAAK,CAAC;eAC5B,KAAK,OAAO,MAAM,GAAG,MAAM;eAQ3B,KAAK,OAAO,MAAM,GAAG,MAAM,SAAS,OAAO;0BAmChC,KAAK,OAAO,MAAM,GAAG,MAAM;aAOxC,KAAK,OAAO,MAAM,GAAG,MAAM;CAItC,CAAA;AAGF,eAAO,MAAM,0BAA0B,GAAI,CAAC,SAAS,MAAM,EAAE,SAAS,oBAAoB;eAC3E,CAAC,OAAO,MAAM,GAAG,MAAM;eAKvB,CAAC,OAAO,MAAM,GAAG,MAAM,SAAS,OAAO;0BAkC5B,CAAC,OAAO,MAAM,GAAG,MAAM;aAOpC,CAAC,OAAO,MAAM,GAAG,MAAM;CAIlC,CAAA;AAGF,eAAO,MAAM,yBAAyB,GAAI,SAAS,oBAAoB;eACxD,OAAO,EAAE,OAAO,MAAM,GAAG,MAAM;eAwB/B,OAAO,EAAE,OAAO,MAAM,GAAG,MAAM,SAAS,OAAO;aA6BjD,OAAO,EAAE,OAAO,MAAM,GAAG,MAAM;CAI1C,CAAA;AAIF,eAAO,MAAM,uBAAuB,GAAI,SAAS,oBAAoB;eACtD,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,MAAM,GAAG,MAAM;aA+C7C,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,MAAM,GAAG,MAAM;CAItD,CAAA;AAIF,eAAO,MAAM,uBAAuB,GAAI,SAAS,oBAAoB;eACtD,GAAG,CAAC,OAAO,CAAC,OAAO,MAAM,GAAG,MAAM;aA0CpC,GAAG,CAAC,OAAO,CAAC,OAAO,MAAM,GAAG,MAAM;CAI7C,CAAA;AAgCF,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,MAAM,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,EAAE,CAAC,GAAG,IAAI,CAkCnG;AAED,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,OAAO,EAAE,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,CAkCpG"}
@@ -1 +1 @@
1
- {"version":3,"file":"Link.d.ts","sourceRoot":"","sources":["../../src/components/Link.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAA;AAG3D,MAAM,MAAM,SAAS,GAAG;IACpB,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9B,EAAE,EAAE,IAAI,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE,WAAW,CAAA;CACxB,CAAA;AAED,qBAAa,IAAK,SAAQ,uBAAuB,CAAC,SAAS,CAAC;IACxD,IAAI,SAIe;IACnB,KAAK,UAAW,gBAAgB,UAgB/B;IACD,OAAO,oBAUN;CACJ"}
1
+ {"version":3,"file":"Link.d.ts","sourceRoot":"","sources":["../../src/components/Link.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAA;AAG3D,MAAM,MAAM,SAAS,GAAG;IACpB,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9B,EAAE,EAAE,IAAI,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE,WAAW,CAAA;CACxB,CAAA;AAED,qBAAa,IAAK,SAAQ,uBAAuB,CAAC,SAAS,CAAC;IACxD,IAAI,SAIe;IACnB,KAAK,GAAI,OAAO,gBAAgB,UAgB/B;IACD,OAAO,oBAUN;CACJ"}
@@ -21,7 +21,7 @@ export class Link extends TungstenSimpleComponent {
21
21
  // to = (this.props.to === '/')
22
22
  // ? '/'
23
23
  // : `${to}.html`
24
- console.log('go to', to);
24
+ //console.log('go to', to)
25
25
  this.__instance.goto(to);
26
26
  });
27
27
  _defineProperty(this, "content", () => {
@@ -1 +1 @@
1
- {"version":3,"file":"Stylesheet.d.ts","sourceRoot":"","sources":["../../src/components/Stylesheet.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAA;AAM3D,MAAM,WAAW,eAAe;IAC5B,QAAQ,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CAC7B;AAED,qBAAa,UAAW,SAAQ,uBAAuB,CAAC,eAAe,CAAC;IACpE,OAAO,gDAON;CACJ"}
1
+ {"version":3,"file":"Stylesheet.d.ts","sourceRoot":"","sources":["../../src/components/Stylesheet.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAA;AAQ3D,MAAM,WAAW,eAAe;IAC5B,QAAQ,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CAC7B;AAED,qBAAa,UAAW,SAAQ,uBAAuB,CAAC,eAAe,CAAC;IACpE,OAAO,gDASN;CACJ"}
@@ -7,9 +7,11 @@ export class Stylesheet extends TungstenSimpleComponent {
7
7
  constructor(...args) {
8
8
  super(...args);
9
9
  _defineProperty(this, "content", () => {
10
- //console.log('site base path', this.__instance.config.siteBasePath)
11
- //console.log('href', this.props.children.href)
12
- //console.log('Stylesheet href:', this.props.children?.href)
10
+ // console.log('site base path', this.__instance.config.siteBasePath)
11
+ // console.log('href', this.props.children.href)
12
+ // console.log('Stylesheet href:', this.props.children?.href)
13
+ // console.log('src dir', this.__instance.config.sourceDir)
14
+ // console.log('seek css in ', String(this.__instance.config.sourceDir) + '/' + String(this.props.children?.href))
13
15
  return typeof this.props.children?.href === 'string' ? _jsx("link", {
14
16
  rel: "stylesheet",
15
17
  href: this.__instance.config.siteBasePath + this.props.children.href
@@ -1,5 +1,7 @@
1
- export type Ref<T extends HTMLElement> = {
1
+ export type TungstenRef<T> = {
2
2
  current: T | null;
3
3
  };
4
- export declare function createRef<T extends HTMLElement>(): Ref<T>;
4
+ export declare function createRef<T>(initial: T | null): TungstenRef<T>;
5
+ export type TungstenElementRef<T extends HTMLElement> = TungstenRef<T>;
6
+ export declare function createElementRef<T extends HTMLElement>(initial?: T): TungstenElementRef<T>;
5
7
  //# sourceMappingURL=createRef.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"createRef.d.ts","sourceRoot":"","sources":["../src/createRef.ts"],"names":[],"mappings":"AACA,MAAM,MAAM,GAAG,CAAC,CAAC,SAAS,WAAW,IAAI;IACrC,OAAO,EAAE,CAAC,GAAG,IAAI,CAAA;CACpB,CAAA;AAED,wBAAgB,SAAS,CAAC,CAAC,SAAS,WAAW,KAAK,GAAG,CAAC,CAAC,CAAC,CAEzD"}
1
+ {"version":3,"file":"createRef.d.ts","sourceRoot":"","sources":["../src/createRef.ts"],"names":[],"mappings":"AACA,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IACzB,OAAO,EAAE,CAAC,GAAG,IAAI,CAAA;CACpB,CAAA;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,GAAG,WAAW,CAAC,CAAC,CAAC,CAE9D;AAGD,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,WAAW,IAAI,WAAW,CAAC,CAAC,CAAC,CAAA;AAEtE,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,WAAW,EAAE,OAAO,CAAC,EAAE,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAE1F"}
package/dist/createRef.js CHANGED
@@ -1,5 +1,8 @@
1
- export function createRef() {
1
+ export function createRef(initial) {
2
2
  return {
3
- current: null
3
+ current: initial
4
4
  };
5
+ }
6
+ export function createElementRef(initial) {
7
+ return createRef(initial || null);
5
8
  }
@@ -0,0 +1,3 @@
1
+ import { AppRoutes } from "./routing/AppRoutes.js";
2
+ export declare function createRoutes<T extends AppRoutes>(appRoutes: T): T;
3
+ //# sourceMappingURL=createRoutes.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"createRoutes.d.ts","sourceRoot":"","sources":["../src/createRoutes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,wBAAgB,YAAY,CAAC,CAAC,SAAS,SAAS,EAAE,SAAS,EAAE,CAAC,KAE7D"}
@@ -0,0 +1,3 @@
1
+ export function createRoutes(appRoutes) {
2
+ return appRoutes;
3
+ }
@@ -1,5 +1,6 @@
1
1
  export declare const defaultConfig: {
2
2
  codeDir: string;
3
+ useRootComponent: true;
3
4
  rootComponent: string;
4
5
  siteBasePath: "";
5
6
  clientSideNav: true;
@@ -1 +1 @@
1
- {"version":3,"file":"defaultConfig.d.ts","sourceRoot":"","sources":["../src/defaultConfig.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,aAAa;;;;;;;;;;;;;;CAiBS,CAAA;AAEnC,MAAM,MAAM,sBAAsB,GAAG,OAAO,aAAa,CAAA"}
1
+ {"version":3,"file":"defaultConfig.d.ts","sourceRoot":"","sources":["../src/defaultConfig.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;CAkBS,CAAA;AAEnC,MAAM,MAAM,sBAAsB,GAAG,OAAO,aAAa,CAAA"}
@@ -1,6 +1,7 @@
1
1
  export const defaultConfig = {
2
2
  codeDir: '',
3
3
  //exclude: glob
4
+ useRootComponent: true,
4
5
  rootComponent: 'Root.jsx',
5
6
  // may make this work without extension too later on
6
7
  siteBasePath: '',
@@ -1 +1 @@
1
- {"version":3,"file":"findUserConfig.d.ts","sourceRoot":"","sources":["../src/findUserConfig.ts"],"names":[],"mappings":"AAaA,wBAAsB,cAAc,CAAC,UAAU,EAAE,MAAM;;;;UAiEtD"}
1
+ {"version":3,"file":"findUserConfig.d.ts","sourceRoot":"","sources":["../src/findUserConfig.ts"],"names":[],"mappings":"AAaA,wBAAsB,cAAc,CAAC,UAAU,EAAE,MAAM;;;;UAsEtD"}
@@ -41,7 +41,7 @@ export async function findUserConfig(projectDir) {
41
41
  }
42
42
  }
43
43
  }
44
- cliWarn(`${packageNameCapitalized} did not find a user config. You can configure ${packageNameCapitalized} by creating a config file ${configName}.js in your project root, or in a folder called config.`);
44
+ cliWarn(`${packageNameCapitalized} did not find a user config.` + ` You can configure ${packageNameCapitalized} by creating a config file ${configName}.js` + ` in your project root, or in a folder called config.`);
45
45
  return null;
46
46
  //})()
47
47
  // if ( configInfo ) {
@@ -0,0 +1,188 @@
1
+ import { ParserOptions as BabelParserOptions } from '@babel/parser';
2
+ import { SiteBasePath } from './render/HeadData.js';
3
+ declare const frameworkConfigWithRootComponentValidator: import("arktype/internal/methods/object.ts").ObjectType<{
4
+ codeDir?: string;
5
+ copy?: string;
6
+ exclude?: string;
7
+ copyExclude?: string;
8
+ sourceDir?: string;
9
+ publicDir?: string;
10
+ assetsDir?: string;
11
+ styleImportBase?: string;
12
+ siteBasePath?: string;
13
+ clientSideNav?: boolean;
14
+ staticSite?: boolean;
15
+ routesLocation?: [string, string];
16
+ envSchemasLocation?: string;
17
+ babelOptions?: {
18
+ allowImportExportEverywhere?: boolean;
19
+ allowAwaitOutsideFunction?: boolean;
20
+ allowReturnOutsideFunction?: boolean;
21
+ allowNewTargetOutsideFunction?: boolean;
22
+ allowSuperOutsideMethod?: boolean;
23
+ allowUndeclaredExports?: boolean;
24
+ annexB?: boolean;
25
+ attachComment?: boolean;
26
+ errorRecovery?: boolean;
27
+ sourceType?: "script" | "module" | "unambiguous";
28
+ sourceFilename?: string;
29
+ startLine?: number;
30
+ startColumn?: number;
31
+ plugins?: unknown[];
32
+ strictMode?: boolean;
33
+ ranges?: boolean;
34
+ tokens?: boolean;
35
+ createParenthesizedExpressions?: boolean;
36
+ createImportExpressions?: boolean;
37
+ };
38
+ packageSystem?: "rewrites" | "aliases";
39
+ ignoreDirs?: string[];
40
+ ignorePatterns?: string | string[];
41
+ serverMiddleware?: [string, string, string];
42
+ apiRoutes?: string;
43
+ apiPath?: string;
44
+ rootComponent: string;
45
+ useRootComponent?: true;
46
+ }, {}>;
47
+ declare const frameworkConfigWithoutRootComponentValidator: import("arktype/internal/methods/object.ts").ObjectType<{
48
+ codeDir?: string;
49
+ copy?: string;
50
+ exclude?: string;
51
+ copyExclude?: string;
52
+ sourceDir?: string;
53
+ publicDir?: string;
54
+ assetsDir?: string;
55
+ styleImportBase?: string;
56
+ siteBasePath?: string;
57
+ clientSideNav?: boolean;
58
+ staticSite?: boolean;
59
+ routesLocation?: [string, string];
60
+ envSchemasLocation?: string;
61
+ babelOptions?: {
62
+ allowImportExportEverywhere?: boolean;
63
+ allowAwaitOutsideFunction?: boolean;
64
+ allowReturnOutsideFunction?: boolean;
65
+ allowNewTargetOutsideFunction?: boolean;
66
+ allowSuperOutsideMethod?: boolean;
67
+ allowUndeclaredExports?: boolean;
68
+ annexB?: boolean;
69
+ attachComment?: boolean;
70
+ errorRecovery?: boolean;
71
+ sourceType?: "script" | "module" | "unambiguous";
72
+ sourceFilename?: string;
73
+ startLine?: number;
74
+ startColumn?: number;
75
+ plugins?: unknown[];
76
+ strictMode?: boolean;
77
+ ranges?: boolean;
78
+ tokens?: boolean;
79
+ createParenthesizedExpressions?: boolean;
80
+ createImportExpressions?: boolean;
81
+ };
82
+ packageSystem?: "rewrites" | "aliases";
83
+ ignoreDirs?: string[];
84
+ ignorePatterns?: string | string[];
85
+ serverMiddleware?: [string, string, string];
86
+ apiRoutes?: string;
87
+ apiPath?: string;
88
+ useRootComponent: false;
89
+ }, {}>;
90
+ export declare const frameworkConfigValidator: import("arktype/internal/methods/object.ts").ObjectType<{
91
+ codeDir?: string;
92
+ copy?: string;
93
+ exclude?: string;
94
+ copyExclude?: string;
95
+ sourceDir?: string;
96
+ publicDir?: string;
97
+ assetsDir?: string;
98
+ styleImportBase?: string;
99
+ siteBasePath?: string;
100
+ clientSideNav?: boolean;
101
+ staticSite?: boolean;
102
+ routesLocation?: [string, string];
103
+ envSchemasLocation?: string;
104
+ babelOptions?: {
105
+ allowImportExportEverywhere?: boolean;
106
+ allowAwaitOutsideFunction?: boolean;
107
+ allowReturnOutsideFunction?: boolean;
108
+ allowNewTargetOutsideFunction?: boolean;
109
+ allowSuperOutsideMethod?: boolean;
110
+ allowUndeclaredExports?: boolean;
111
+ annexB?: boolean;
112
+ attachComment?: boolean;
113
+ errorRecovery?: boolean;
114
+ sourceType?: "script" | "module" | "unambiguous";
115
+ sourceFilename?: string;
116
+ startLine?: number;
117
+ startColumn?: number;
118
+ plugins?: unknown[];
119
+ strictMode?: boolean;
120
+ ranges?: boolean;
121
+ tokens?: boolean;
122
+ createParenthesizedExpressions?: boolean;
123
+ createImportExpressions?: boolean;
124
+ };
125
+ packageSystem?: "rewrites" | "aliases";
126
+ ignoreDirs?: string[];
127
+ ignorePatterns?: string | string[];
128
+ serverMiddleware?: [string, string, string];
129
+ apiRoutes?: string;
130
+ apiPath?: string;
131
+ rootComponent: string;
132
+ useRootComponent?: true;
133
+ } | {
134
+ codeDir?: string;
135
+ copy?: string;
136
+ exclude?: string;
137
+ copyExclude?: string;
138
+ sourceDir?: string;
139
+ publicDir?: string;
140
+ assetsDir?: string;
141
+ styleImportBase?: string;
142
+ siteBasePath?: string;
143
+ clientSideNav?: boolean;
144
+ staticSite?: boolean;
145
+ routesLocation?: [string, string];
146
+ envSchemasLocation?: string;
147
+ babelOptions?: {
148
+ allowImportExportEverywhere?: boolean;
149
+ allowAwaitOutsideFunction?: boolean;
150
+ allowReturnOutsideFunction?: boolean;
151
+ allowNewTargetOutsideFunction?: boolean;
152
+ allowSuperOutsideMethod?: boolean;
153
+ allowUndeclaredExports?: boolean;
154
+ annexB?: boolean;
155
+ attachComment?: boolean;
156
+ errorRecovery?: boolean;
157
+ sourceType?: "script" | "module" | "unambiguous";
158
+ sourceFilename?: string;
159
+ startLine?: number;
160
+ startColumn?: number;
161
+ plugins?: unknown[];
162
+ strictMode?: boolean;
163
+ ranges?: boolean;
164
+ tokens?: boolean;
165
+ createParenthesizedExpressions?: boolean;
166
+ createImportExpressions?: boolean;
167
+ };
168
+ packageSystem?: "rewrites" | "aliases";
169
+ ignoreDirs?: string[];
170
+ ignorePatterns?: string | string[];
171
+ serverMiddleware?: [string, string, string];
172
+ apiRoutes?: string;
173
+ apiPath?: string;
174
+ useRootComponent: false;
175
+ }, {}>;
176
+ type ArkFrameworkConfigWithRootComponent = typeof frameworkConfigWithRootComponentValidator.infer;
177
+ type ArkFrameworkConfigWithoutRootComponent = typeof frameworkConfigWithoutRootComponentValidator.infer;
178
+ interface FrameworkConfigWithRootComponent extends Omit<ArkFrameworkConfigWithRootComponent, 'siteBasePath' | 'babelOptions'> {
179
+ siteBasePath?: SiteBasePath;
180
+ babelOptions?: BabelParserOptions;
181
+ }
182
+ interface FrameworkConfigWithoutRootComponent extends Omit<ArkFrameworkConfigWithoutRootComponent, 'siteBasePath' | 'babelOptions'> {
183
+ siteBasePath?: SiteBasePath;
184
+ babelOptions?: BabelParserOptions;
185
+ }
186
+ export type FrameworkConfig = FrameworkConfigWithRootComponent | FrameworkConfigWithoutRootComponent;
187
+ export {};
188
+ //# sourceMappingURL=frameworkConfigSchema.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"frameworkConfigSchema.d.ts","sourceRoot":"","sources":["../src/frameworkConfigSchema.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,IAAI,kBAAkB,EAAE,MAAM,eAAe,CAAA;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAwDnD,QAAA,MAAM,yCAAyC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAK7C,CAAA;AAEF,QAAA,MAAM,4CAA4C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAIhD,CAAA;AAEF,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAEoB,CAAA;AAEzD,KAAK,mCAAmC,GAAG,OAAO,yCAAyC,CAAC,KAAK,CAAA;AACjG,KAAK,sCAAsC,GAAG,OAAO,4CAA4C,CAAC,KAAK,CAAA;AAIvG,UAAU,gCACN,SAAQ,IAAI,CAAC,mCAAmC,EAAE,cAAc,GAAG,cAAc,CAAC;IAClF,YAAY,CAAC,EAAE,YAAY,CAAA;IAC3B,YAAY,CAAC,EAAE,kBAAkB,CAAA;CACpC;AAED,UAAU,mCACN,SAAQ,IAAI,CAAC,sCAAsC,EAAE,cAAc,GAAG,cAAc,CAAC;IACrF,YAAY,CAAC,EAAE,YAAY,CAAA;IAC3B,YAAY,CAAC,EAAE,kBAAkB,CAAA;CACpC;AAED,MAAM,MAAM,eAAe,GAAG,gCAAgC,GAAG,mCAAmC,CAAA"}
@@ -0,0 +1,65 @@
1
+ import { type as arkType } from 'arktype';
2
+ const babelParserOptionsType = arkType({
3
+ 'allowImportExportEverywhere?': 'boolean',
4
+ 'allowAwaitOutsideFunction?': 'boolean',
5
+ 'allowReturnOutsideFunction?': 'boolean',
6
+ 'allowNewTargetOutsideFunction?': 'boolean',
7
+ 'allowSuperOutsideMethod?': 'boolean',
8
+ 'allowUndeclaredExports?': 'boolean',
9
+ 'annexB?': 'boolean',
10
+ 'attachComment?': 'boolean',
11
+ 'errorRecovery?': 'boolean',
12
+ 'sourceType?': '"script" | "module" | "unambiguous"',
13
+ 'sourceFilename?': 'string',
14
+ 'startLine?': 'number',
15
+ 'startColumn?': 'number',
16
+ //'plugins?': ParserPlugin[]
17
+ 'plugins?': 'unknown[]',
18
+ 'strictMode?': 'boolean',
19
+ 'ranges?': 'boolean',
20
+ 'tokens?': ' boolean',
21
+ 'createParenthesizedExpressions?': 'boolean',
22
+ 'createImportExpressions?': 'boolean'
23
+ });
24
+ const frameworkConfigBaseValidator = arkType({
25
+ 'codeDir?': 'string',
26
+ 'copy?': 'string',
27
+ 'exclude?': 'string',
28
+ 'copyExclude?': 'string',
29
+ 'sourceDir?': 'string',
30
+ 'publicDir?': 'string',
31
+ 'assetsDir?': 'string',
32
+ 'styleImportBase?': 'string',
33
+ //publicDir?: string
34
+ //siteBasePath?: "" | `/${string}`,
35
+ 'siteBasePath?': '"" | /^\\/.*$/',
36
+ 'clientSideNav?': 'boolean',
37
+ 'staticSite?': 'boolean',
38
+ // not ready // uniqueComponents?: boolean
39
+ // not ready // bindMode?: BindMode
40
+ //appLocation: AppLocation
41
+ //useRootComponent: boolean
42
+ //rootComponent?: string
43
+ 'routesLocation?': ['string', 'string'],
44
+ 'envSchemasLocation?': 'string',
45
+ 'babelOptions?': babelParserOptionsType,
46
+ 'packageSystem?': '"rewrites" | "aliases"',
47
+ 'ignoreDirs?': 'string[]',
48
+ // rename to ignoreFolders?
49
+ 'ignorePatterns?': 'string | string[]',
50
+ 'serverMiddleware?': ['string', 'string', 'string'],
51
+ 'apiRoutes?': 'string',
52
+ 'apiPath?': 'string'
53
+ });
54
+ const frameworkConfigWithRootComponentValidator = arkType({
55
+ '...': frameworkConfigBaseValidator,
56
+ // in an intersection, non-overlapping values at isAdmin would result in a ParseError
57
+ 'useRootComponent?': 'true',
58
+ rootComponent: 'string'
59
+ });
60
+ const frameworkConfigWithoutRootComponentValidator = arkType({
61
+ '...': frameworkConfigBaseValidator,
62
+ // in an intersection, non-overlapping values at isAdmin would result in a ParseError
63
+ 'useRootComponent': 'false'
64
+ });
65
+ export const frameworkConfigValidator = frameworkConfigWithRootComponentValidator.or(frameworkConfigWithoutRootComponentValidator);
@@ -1,16 +1,2 @@
1
- export declare function getConfig(): Promise<{
2
- codeDir: string;
3
- rootComponent: string;
4
- siteBasePath: "";
5
- clientSideNav: true;
6
- staticSite: false;
7
- uniqueComponents: false;
8
- bindMode: "direct";
9
- appLocation: string;
10
- routesLocation: [string, string];
11
- envSchemasLocation: string;
12
- packageSystem: "rewrites";
13
- ignoreDirs: string[];
14
- apiPath: string;
15
- } | Partial<import("./FrameworkConfig.js").FrameworkConfig>>;
1
+ export {};
16
2
  //# sourceMappingURL=getConfig.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"getConfig.d.ts","sourceRoot":"","sources":["../src/getConfig.ts"],"names":[],"mappings":"AAMA,wBAAsB,SAAS;;;;;;;;;;;;;;6DAO9B"}
1
+ {"version":3,"file":"getConfig.d.ts","sourceRoot":"","sources":["../src/getConfig.ts"],"names":[],"mappings":""}
package/dist/getConfig.js CHANGED
@@ -1,11 +1,12 @@
1
- import { defaultConfig } from "./defaultConfig.js";
2
- import { findUserConfig } from "./findUserConfig.js";
3
- import { mergeConfigs } from "./mergeConfigs.js";
4
- export async function getConfig() {
5
- const userConfigOrNull = await findUserConfig(process.cwd());
6
- if (userConfigOrNull !== null) {
7
- const userConfig = userConfigOrNull;
8
- return mergeConfigs(defaultConfig, userConfig.data);
9
- }
10
- return defaultConfig;
11
- }
1
+ // import { defaultConfig } from './defaultConfig.js'
2
+ // import { findUserConfig } from './findUserConfig.js'
3
+ // import { mergeConfigs } from './mergeConfigs.js'
4
+ export {};
5
+ // export async function getConfig() {
6
+ // const userConfigOrNull = await findUserConfig(process.cwd())
7
+ // if (userConfigOrNull !== null) {
8
+ // const userConfig = userConfigOrNull
9
+ // return mergeConfigs(defaultConfig, userConfig.data)
10
+ // }
11
+ // return defaultConfig
12
+ // }
@@ -1 +1 @@
1
- {"version":3,"file":"getRoutes.d.ts","sourceRoot":"","sources":["../src/getRoutes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAEjC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAGvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAG5D,wBAAsB,SAAS,CAAC,eAAe,EAAE,eAAe,EAAE,MAAM,EAAE,uBAAuB,EAAE,IAAI,GAAE,IAAI,GAAG,IAAW,EAAE,GAAG,UAAQ,GAClI,OAAO,CAAC,SAAS,CAAC,CAyBvB"}
1
+ {"version":3,"file":"getRoutes.d.ts","sourceRoot":"","sources":["../src/getRoutes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAEjC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAGvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAG5D,wBAAsB,SAAS,CAC3B,eAAe,EAAE,eAAe,EAAE,MAAM,EAAE,uBAAuB,EAAE,IAAI,GAAE,IAAI,GAAG,IAAW,EAAE,GAAG,UAAQ,GACxG,OAAO,CAAC,SAAS,CAAC,CAiCrB"}
package/dist/getRoutes.js CHANGED
@@ -4,21 +4,26 @@ import { TungstenError } from "./TungstenError.js";
4
4
  export async function getRoutes(compilationInfo, config, load = null, dev = false) {
5
5
  //console.log('config.routesLocation', config.routesLocation)
6
6
  //console.log('config.routesLocation', config.routesLocation)
7
- const [routesFile, routeExport] = config.routesLocation;
8
- //console.log(join(compilationInfo.location, routesFile))
9
- //console.log(fixExtension( join(compilationInfo.location, routesFile) ))
10
- const filePath = 'file://' + fixExtension(join(compilationInfo.location, routesFile));
11
- let module;
12
- if (dev && load) {
13
- // can we share load across the render?
14
- //const load = await createLoad(import.meta.url, sxyLoaderConfig)
15
- module = await load(filePath);
7
+ const routesLocation = config.routesLocation;
8
+ if (routesLocation === null) {
9
+ return routesLocation;
16
10
  } else {
17
- module = await import(filePath); // import the module
11
+ const [routesFile, routeExport] = routesLocation;
12
+ //console.log(join(compilationInfo.location, routesFile))
13
+ //console.log(fixExtension( join(compilationInfo.location, routesFile) ))
14
+ const filePath = 'file://' + fixExtension(join(compilationInfo.location, routesFile));
15
+ let module;
16
+ if (dev && load) {
17
+ // can we share load across the render?
18
+ //const load = await createLoad(import.meta.url, sxyLoaderConfig)
19
+ module = await load(filePath);
20
+ } else {
21
+ module = await import(filePath); // import the module
22
+ }
23
+ // use the config to determine the export name
24
+ if (!(routeExport in module)) {
25
+ throw new TungstenError(`Could not find an export named ${routeExport} in routes file ${routesFile}.` + ` These settings are set in config.routesLocation.`);
26
+ }
27
+ return module[routeExport];
18
28
  }
19
- // use the config to determine the export name
20
- if (!(routeExport in module)) {
21
- throw new TungstenError(`Could not find an export named ${routeExport} in routes file ${routesFile}. These settings are set in config.routesLocation.`);
22
- }
23
- return module[config.routesLocation[1]];
24
29
  }
@@ -0,0 +1,3 @@
1
+ import { FrameworkConfigComplete } from './FrameworkConfig.js';
2
+ export declare function getUserConfig(): Promise<FrameworkConfigComplete>;
3
+ //# sourceMappingURL=getUserConfig.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"getUserConfig.d.ts","sourceRoot":"","sources":["../src/getUserConfig.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AAM9D,wBAAsB,aAAa,IAAI,OAAO,CAAC,uBAAuB,CAAC,CAyBtE"}
@@ -0,0 +1,25 @@
1
+ import { ArkErrors } from 'arktype';
2
+ import { defaultConfig } from "./defaultConfig.js";
3
+ import { findUserConfig } from "./findUserConfig.js";
4
+ import { frameworkConfigValidator } from "./frameworkConfigSchema.js";
5
+ import { makeFinalConfig } from "./makeFinalConfig.js";
6
+ import { throwError } from "./throwError.js";
7
+ import { cliOut } from "./cliOutput.js";
8
+ export async function getUserConfig() {
9
+ const userConfigOrNull = await findUserConfig(process.cwd());
10
+ //frameworkCon
11
+ if (userConfigOrNull !== null) {
12
+ const userConfig = userConfigOrNull;
13
+ const result = frameworkConfigValidator(userConfig.data);
14
+ if (result instanceof ArkErrors) {
15
+ cliOut('Config', userConfig);
16
+ throwError('Your tungsten config did not match the required format', JSON.stringify(result.flatProblemsByPath));
17
+ }
18
+ const finalConfig = makeFinalConfig(result);
19
+ //console.log('finalConfig', finalConfig)
20
+ return finalConfig;
21
+ //return makeFinalConfig(userConfig.data)
22
+ } else {
23
+ return defaultConfig;
24
+ }
25
+ }
@@ -1 +1 @@
1
- {"version":3,"file":"hasDomain.d.ts","sourceRoot":"","sources":["../src/hasDomain.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,SAAS,GAAI,IAAI,EAAE,MAAM,SAAS,MAAM,QAC3C,IAAI,QACJ,MAAM,KACb,IAAI,IAAI,IAAI,GAAG,WAAW,CAAC,MAAM,CAAqC,CAAA;AAuBzE,MAAM,MAAM,QAAQ,CAAC,IAAI,IAAI,OAAO,SAAS,IAAI,GAC3C,MAAM,GACN,IAAI,SAAS,MAAM,GACf,QAAQ,GACR,IAAI,SAAS,MAAM,GACf,QAAQ,GACR,IAAI,SAAS,MAAM,GACf,QAAQ,GACR,IAAI,SAAS,OAAO,GAChB,SAAS,GACT,IAAI,SAAS,SAAS,GAClB,WAAW,GACX,IAAI,SAAS,IAAI,GACb,MAAM,GACN,IAAI,SAAS,MAAM,GACf,QAAQ,GACR,IAAI,SAAS,MAAM,GACf,QAAQ,GACR,KAAK,CAAA;AAE3C,KAAK,aAAa,GAAG;IACjB,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,SAAS,CAAA;IACpB,IAAI,EAAE,IAAI,CAAA;CACb,CAAA;AAKD,eAAO,MAAM,QAAQ,GAAI,IAAI,QAAQ,IAAI,KAUhC,QAAQ,CAAC,IAAI,CACrB,CAAA;AAGD,KAAK,QAAQ,CAAC,CAAC,IAAI;KAAE,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAC,GAAG,OAAO,CAAA;AAEnD,MAAM,MAAM,WAAW,CAAC,IAAI,SAAS,MAAM,IAAI,MAAM,SAAS,IAAI,GAC5D,OAAO,GACP,aAAa,CAAC,IAAI,CAAC,CAAA;AAEzB,MAAM,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,aAAa,CAAC,CAAA"}
1
+ {"version":3,"file":"hasDomain.d.ts","sourceRoot":"","sources":["../src/hasDomain.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,SAAS,GAAI,IAAI,EAAE,MAAM,SAAS,MAAM,EACjD,MAAM,IAAI,EACV,MAAM,MAAM,KACb,IAAI,IAAI,IAAI,GAAG,WAAW,CAAC,MAAM,CAAqC,CAAA;AAuBzE,MAAM,MAAM,QAAQ,CAAC,IAAI,IAAI,OAAO,SAAS,IAAI,GAC3C,MAAM,GACN,IAAI,SAAS,MAAM,GACf,QAAQ,GACR,IAAI,SAAS,MAAM,GACf,QAAQ,GACR,IAAI,SAAS,MAAM,GACf,QAAQ,GACR,IAAI,SAAS,OAAO,GAChB,SAAS,GACT,IAAI,SAAS,SAAS,GAClB,WAAW,GACX,IAAI,SAAS,IAAI,GACb,MAAM,GACN,IAAI,SAAS,MAAM,GACf,QAAQ,GACR,IAAI,SAAS,MAAM,GACf,QAAQ,GACR,KAAK,CAAA;AAE3C,KAAK,aAAa,GAAG;IACjB,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,SAAS,CAAA;IACpB,IAAI,EAAE,IAAI,CAAA;CACb,CAAA;AAKD,eAAO,MAAM,QAAQ,GAAI,IAAI,EAAE,MAAM,IAAI,KAUhC,QAAQ,CAAC,IAAI,CACrB,CAAA;AAGD,KAAK,QAAQ,CAAC,CAAC,IAAI;KAAE,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAC,GAAG,OAAO,CAAA;AAEnD,MAAM,MAAM,WAAW,CAAC,IAAI,SAAS,MAAM,IAAI,MAAM,SAAS,IAAI,GAC5D,OAAO,GACP,aAAa,CAAC,IAAI,CAAC,CAAA;AAEzB,MAAM,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,aAAa,CAAC,CAAA"}
@@ -1,3 +1,7 @@
1
1
  import type { FunctionElement } from '../FunctionComponentStandIn.js';
2
+ import { FunctionComponentStandInAny } from 'tungsten/FunctionComponentStandIn.js';
3
+ declare global {
4
+ let __tungsten_current_function_component_stand_in: FunctionComponentStandInAny;
5
+ }
2
6
  export declare function getCurrentComponent(): FunctionElement<any, any>;
3
7
  //# sourceMappingURL=getCurrentComponent.d.ts.map