tungsten 0.6.2 → 0.7.0

package/dist/routing/defineRoutes.d.ts

@@ -0,0 +1,8 @@
+import type { ReqRes } from '../ReqRes.js';
+import type { Endpoint } from './RouteTypes.js';
+import type { CustomRoutes } from './Routes.js';
+type AnyRoutes = CustomRoutes<Endpoint<any, any>>;
+export declare function defineRoutes<const R extends AnyRoutes>(routes: R): R;
+export declare function defineRoutes<const R extends AnyRoutes>(routes: (reqRes: ReqRes | null) => R): (reqRes: ReqRes | null) => R;
+export {};
+//# sourceMappingURL=defineRoutes.d.ts.map

package/dist/routing/defineRoutes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"defineRoutes.d.ts","sourceRoot":"","sources":["../../src/routing/defineRoutes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAK/C,KAAK,SAAS,GAAG,YAAY,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAA;AAEjD,wBAAgB,YAAY,CAAC,KAAK,CAAC,CAAC,SAAS,SAAS,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,CAAA;AACrE,wBAAgB,YAAY,CAAC,KAAK,CAAC,CAAC,SAAS,SAAS,EAClD,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,KAAK,CAAC,GACrC,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,KAAK,CAAC,CAAA"}

package/dist/routing/defineRoutes.js

@@ -0,0 +1,3 @@
+export function defineRoutes(routes) {
+  return routes;
+}

package/dist/routing/pyramidRouting.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=pyramidRouting.d.ts.map

package/dist/routing/pyramidRouting.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pyramidRouting.d.ts","sourceRoot":"","sources":["../../src/routing/pyramidRouting.ts"],"names":[],"mappings":""}

package/dist/routing/pyramidRouting.js

@@ -0,0 +1,13 @@
+export {};
+// const register = {
+//     context: <C,>(contextInitializer: new () => C) => ({
+//         networkedData: <ND,>(networkedDataInitializer: new (reqRes: ReqResOrNull, context: C) => ND) => ({
+//             globalData: <G,>(getGlobalData: (reqRes: ReqResOrNull, context: C) => Promise<G>) => ({
+//                 routes: <Rs,>(getRoutes: (reqRes: ReqResOrNull, context: C) => Rs) => {
+//                     const routing = {}
+//                     return routing
+//                 }
+//             })
+//         })
+//     })
+// }

package/dist/routing/registerGlobalData.d.ts

@@ -1,9 +1,17 @@
+import type { BrandedContext, BrandedGlobalData, BrandedNetworkedData } from '../Brands.js';
 import type { ReqRes } from '../ReqRes.js';
+import type { Context } from '../context/registerContext.js';
+import type { NetworkedData } from './routingRegistry.js';
+import type { Serializable } from './Serializable.js';
+import type { Fixed } from './registrationTypes.js';
 export interface GlobalData {
 }
-export type GlobalDataFunction = (reqRes: ReqRes) => Promise<GlobalData>;
+export type GlobalDataFunction<C = Context, NS = NetworkedData, G extends object = GlobalData> = (reqRes: ReqRes | null, context: C, networkedStore: NS) => Promise<G>;
+export type BrandedGlobalDataFunction = (reqRes: ReqRes | null, context: BrandedContext, networkedStore: BrandedNetworkedData) => Promise<BrandedGlobalData>;
 export declare const globalDataFunc: {
-    value: GlobalDataFunction | undefined;
+    value: BrandedGlobalDataFunction | undefined;
 };
-export declare function registerGlobalData(func: GlobalDataFunction): void;
+export declare function registerGlobalData<G extends object>(func: GlobalDataFunction<Context, NetworkedData, G> & ((reqRes: ReqRes | null, context: Context, networkedData: NetworkedData) => Promise<Serializable<NoInfer<G>>>)): Fixed<{
+    globalData: G;
+}>;
 //# sourceMappingURL=registerGlobalData.d.ts.map

package/dist/routing/registerGlobalData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registerGlobalData.d.ts","sourceRoot":"","sources":["../../src/routing/registerGlobalData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAG1C,MAAM,WAAW,UAAU;CAAG;AAE9B,MAAM,MAAM,kBAAkB,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAA;AAExE,eAAO,MAAM,cAAc,EAAE;IAAE,KAAK,EAAE,kBAAkB,GAAG,SAAS,CAAA;CAAyB,CAAA;AAE7F,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,kBAAkB,QAE1D"}
+{"version":3,"file":"registerGlobalData.d.ts","sourceRoot":"","sources":["../../src/routing/registerGlobalData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AAC3F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAA;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAInD,MAAM,WAAW,UAAU;CAAG;AAM9B,MAAM,MAAM,kBAAkB,CAC1B,CAAC,GAAG,OAAO,EACX,EAAE,GAAG,aAAa,EAClB,CAAC,SAAS,MAAM,GAAG,UAAU,IAC7B,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,cAAc,EAAE,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,CAAA;AAEzE,MAAM,MAAM,yBAAyB,GAM/B,CACE,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,oBAAoB,KACnF,OAAO,CAAC,iBAAiB,CAAC,CAAA;AAEnC,eAAO,MAAM,cAAc,EAAE;IAAE,KAAK,EAAE,yBAAyB,GAAG,SAAS,CAAA;CACjD,CAAA;AAK1B,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,MAAM,EAC/C,IAAI,EAAE,kBAAkB,CAAC,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC,GAE7C,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,KACtE,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAC1C,KAAK,CAAC;IAAE,UAAU,EAAE,CAAC,CAAA;CAAE,CAAC,CAK1B"}

package/dist/routing/registerGlobalData.js

@@ -1,6 +1,12 @@
 export const globalDataFunc = {
   value: undefined
 };
+// the callback is handed the global Context and NetworkedData; G is inferred from what it returns,
+// and handed back as a type-only token for GlobalData's augmentation - `GlobalDataType<typeof
+// registration>`. Also set by registerRouting() and the routing builder - the last registration wins
 export function registerGlobalData(func) {
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- the framework's branded view of the same function
   globalDataFunc.value = func;
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- the token is type-only
+  return undefined;
 }

package/dist/routing/registerParts.types.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=registerParts.types.test.d.ts.map

package/dist/routing/registerParts.types.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"registerParts.types.test.d.ts","sourceRoot":"","sources":["../../src/routing/registerParts.types.test.ts"],"names":[],"mappings":""}

package/dist/routing/registerParts.types.test.js

@@ -0,0 +1,139 @@
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { registerContext } from '../context/registerContext.js';
+import { registerGlobalData } from './registerGlobalData.js';
+import { registerNetworkedData } from './routingRegistry.js';
+import { registerRoutes } from './registerRoutes.js';
+/*
+ * Type tests for the separate register functions. tsc is the assertion - nothing here runs.
+ *
+ * Each infers only the shape it is given - the class, the store, the data - and returns it as a
+ * token for the augmentation: `interface Context extends ContextType<typeof registration> {}`.
+ * Every callback is typed by the global Context, NetworkedData and GlobalData instead. Unaugmented
+ * - as here, inside tungsten - those are {}, so reading an app member fails, which is what reminds
+ * an app to augment them.
+ */
+class AppContext {
+  constructor(reqRes) {
+    _defineProperty(this, "user", {
+      id: 1
+    });
+    void reqRes;
+  }
+}
+const _contextRegistration = registerContext(AppContext);
+const registeredContext = registeredC;
+void registeredContext;
+class ServerContext {
+  constructor(reqRes) {
+    _defineProperty(this, "reqRes", void 0);
+    _defineProperty(this, "user", {
+      id: 1
+    });
+    this.reqRes = reqRes;
+  }
+}
+class ClientContext {
+  constructor() {
+    _defineProperty(this, "user", {
+      id: 1
+    });
+  }
+}
+const _pairRegistration = registerContext({
+  client: ClientContext,
+  server: ServerContext
+});
+const pairUserId = pairC.user.id;
+void pairUserId;
+class AppStore {
+  constructor(reqRes, context) {
+    _defineProperty(this, "token", 'abc');
+    void reqRes;
+    void context;
+  }
+}
+const _storeRegistration = registerNetworkedData(AppStore);
+const registeredStore = registeredNd;
+void registeredStore;
+const _dataRegistration = registerGlobalData(async () => Promise.resolve({
+  n: 1
+}));
+const registeredData = registeredG;
+void registeredData;
+// ---- the callbacks see the globals, not the registered class ----------------
+registerGlobalData(async (reqRes, context, networkedData) => {
+  const c = context;
+  const nd = networkedData;
+  void c;
+  void nd;
+  // @ts-expect-error -- `user` is on AppContext, but context is the global Context, still {}
+  void context.user;
+  return Promise.resolve({});
+});
+registerNetworkedData(class {
+  constructor(reqRes, context) {
+    void reqRes;
+    // @ts-expect-error -- the same in the store's constructor
+    void context.user;
+  }
+});
+const _appRoutes = registerRoutes((reqRes, context, networkedData) => {
+  const c = context;
+  const nd = networkedData;
+  void c;
+  void nd;
+  // @ts-expect-error -- and in the routes function
+  void context.user;
+  return {
+    '/leads/:id<1+>': {
+      content: (routeData, routeParams, props, globalData) => {
+        void globalData;
+        return null;
+      }
+    },
+    '404': {
+      content: null
+    }
+  };
+});
+// ---- registerRoutes hands back its argument, typed ---------------------------
+const paths = ['/leads/5'];
+void paths;
+// @ts-expect-error -- not a path of these routes
+const notAPath = '/elsewhere';
+void notAPath;
+// @ts-expect-error -- routes must have a `default` or a `404`
+registerRoutes(() => ({
+  '/somewhere': {
+    content: null
+  }
+}));
+const registeredKeys = ['/leads/:id<1+>', '404'];
+void registeredKeys;
+const registeredPath = '/leads/5';
+void registeredPath;
+const _routesObject = registerRoutes({
+  '/about': {
+    content: null
+  },
+  '404': {
+    content: null
+  }
+});
+const objectPath = '/about';
+void objectPath;
+// ---- what cannot cross the network ------------------------------------------
+class StoreHoldingReqRes {
+  constructor(reqRes) {
+    _defineProperty(this, "reqRes", void 0);
+    this.reqRes = reqRes;
+  }
+}
+// @ts-expect-error -- the networked store is serialized into the page
+registerNetworkedData(StoreHoldingReqRes);
+// @ts-expect-error -- and so is the global data
+registerGlobalData(async reqRes => Promise.resolve({
+  leaked: reqRes
+}));

package/dist/routing/registerRoutes.d.ts

@@ -0,0 +1,10 @@
+import type { ReqRes } from '../ReqRes.js';
+import type { Context } from '../context/registerContext.js';
+import type { GlobalData } from './registerGlobalData.js';
+import type { RoutesWithSettings } from './Routes.js';
+import type { NetworkedData } from './routingRegistry.js';
+type GlobalRoutes = RoutesWithSettings<GlobalData>;
+type GlobalRoutesFunction = (reqRes: ReqRes | null, context: Context, networkedData: NetworkedData) => GlobalRoutes;
+export declare function registerRoutes<R extends GlobalRoutes | GlobalRoutesFunction>(routes: R): R;
+export {};
+//# sourceMappingURL=registerRoutes.d.ts.map

package/dist/routing/registerRoutes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"registerRoutes.d.ts","sourceRoot":"","sources":["../../src/routing/registerRoutes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAA;AAE5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAIzD,KAAK,YAAY,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAA;AAClD,KAAK,oBAAoB,GACnB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,KAAK,YAAY,CAAA;AAM7F,wBAAgB,cAAc,CAAC,CAAC,SAAS,YAAY,GAAG,oBAAoB,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,CAG1F"}

package/dist/routing/registerRoutes.js

@@ -0,0 +1,9 @@
+import { registeredRouting } from './routingRegistry.js';
+// the routes, or a function of the request returning them, typed by the global Context,
+// NetworkedData and GlobalData - not inferred. Handed back as given, to type links from:
+// RoutePaths<typeof routes>. Also set by registerRouting() and the routing builder - the last
+// registration wins
+export function registerRoutes(routes) {
+  registeredRouting.value = routes;
+  return routes;
+}

package/dist/routing/registerRouting.d.ts

@@ -0,0 +1,36 @@
+import type { ReqRes } from '../ReqRes.js';
+import type { RoutesWithSettings } from './Routes.js';
+import type { GlobalDataFunction } from './registerGlobalData.js';
+import type { AppPath } from '../components/makeTypedLink.js';
+import type { Serializable } from './Serializable.js';
+import type { KeyedRoutes } from './routesArray.js';
+import type { PipelineApp } from '../pipeline/pipelineDefinition.js';
+import type { $routing, ContextInitializer, Fixed, NetworkedStoreInitializer, RoutesFunctionGeneric } from './registrationTypes.js';
+export type { Serializable } from './Serializable.js';
+export type { ContextInitializer, NetworkedStoreInitializer, RoutesFunctionGeneric, } from './registrationTypes.js';
+type SerializableStore<S> = new (reqRes: ReqRes | null) => Serializable<S>;
+export type Routing<Rs, G, C, NS> = Fixed<{
+    routes: Rs;
+    globalData: G;
+    context: C;
+    networkedStore: NS;
+}>;
+type RoutesOf<R> = R extends Fixed<{
+    routes: infer Rs;
+}> ? Rs : R extends PipelineApp<infer F> ? RoutesOf<F> : R extends (...args: never[]) => infer Rs ? Rs : R;
+export type RoutesType<R extends object> = RoutesProper<KeyedRoutes<RoutesOf<R>>>;
+type RoutesProper<Rs> = {
+    [K in keyof Rs as K extends symbol ? never : K]: Rs[K];
+};
+export type PathsType<R extends object> = AppPath<RoutesType<R>>;
+export type GlobalDataType<R extends Fixed<{
+    globalData: unknown;
+}>> = R[typeof $routing]['globalData'];
+export type ContextType<R extends Fixed<{
+    context: unknown;
+}>> = R[typeof $routing]['context'];
+export type NetworkedDataType<R extends Fixed<{
+    networkedStore: unknown;
+}>> = R[typeof $routing]['networkedStore'];
+export declare function registerRouting<RsS extends RoutesWithSettings<G>, G extends object = object, ContextSchema extends object | undefined = undefined, NetworkedStoreSchema extends object | undefined = undefined>(routesFunction: RoutesFunctionGeneric<G, ContextSchema, NetworkedStoreSchema, RsS>, globalDataFunction: GlobalDataFunction<NoInfer<ContextSchema>, NoInfer<NetworkedStoreSchema>, G> & ((reqRes: ReqRes | null, context: NoInfer<ContextSchema>, store: NoInfer<NetworkedStoreSchema>) => Promise<Serializable<NoInfer<G>>>), context?: ContextInitializer<ContextSchema>, networkedStoreSchema?: NetworkedStoreInitializer<NetworkedStoreSchema> & SerializableStore<NoInfer<NetworkedStoreSchema>>): Routing<RsS, G, ContextSchema, NetworkedStoreSchema>;
+//# sourceMappingURL=registerRouting.d.ts.map

package/dist/routing/registerRouting.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"registerRouting.d.ts","sourceRoot":"","sources":["../../src/routing/registerRouting.ts"],"names":[],"mappings":"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"}

package/dist/routing/registerRouting.js

@@ -0,0 +1,34 @@
+import { registeredRouting, registeredNetworkedStore } from './routingRegistry.js';
+import { contextRegistration } from '../context/registerContext.js';
+import { globalDataFunc } from './registerGlobalData.js';
+const resolvedRoutes = {
+  routes: null
+};
+export function registerRouting(routesFunction,
+// NoInfer on the context and store: they are fixed by the two arguments below, and a callback
+// parameter is a contravariant inference site. Without it an annotated parameter competes and
+// a wider annotation wins - registering Derived but annotating Base yields a Base context
+globalDataFunction, context, networkedStoreSchema) {
+  // read in place of routesLocation's named export, by whichever side imported this module
+  registeredRouting.value = routesFunction;
+  // awaited per request on the server, before routing; hydrated from the page on the client
+  globalDataFunc.value = globalDataFunction;
+  // createContext() news this per request on the server, once per page on the client
+  if (context !== undefined) contextRegistration.value = context; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- ContextSchema may be undefined at the type level, never at this branch
+  if (networkedStoreSchema !== undefined) {
+    registeredNetworkedStore.value = networkedStoreSchema;
+  }
+  return undefined;
+  //return {
+  // getRoutes: () => {
+  //     if (resolvedRoutes.routes === null) throwError('registerRouting', 'routes are not ready yet')
+  //     return resolvedRoutes.routes as Rs // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+  // },
+  // getGlobalData: () => {
+  // },
+  // getContext: () => {
+  // },
+  // getNetworkedStore: () => {
+  // }
+  //}
+}

package/dist/routing/registerRouting.types.test.d.ts

@@ -0,0 +1,80 @@
+import type { ReqRes } from '../ReqRes.js';
+declare class AppContext {
+    reqRes: ReqRes | null;
+    constructor(reqRes: ReqRes | null);
+    user: {
+        id: number;
+    };
+}
+declare class AppStore {
+    constructor(reqRes: ReqRes | null);
+    token: string;
+}
+export declare const both: import("./registerRouting.js").Routing<{
+    default: {
+        content: null;
+    };
+}, {
+    id: number;
+    token: string;
+}, AppContext, AppStore>;
+export declare const contextOnly: import("./registerRouting.js").Routing<{
+    default: {
+        content: null;
+    };
+}, {
+    id: number;
+}, AppContext, undefined>;
+export declare const neither: import("./registerRouting.js").Routing<{
+    default: {
+        content: null;
+    };
+}, {
+    count: number;
+}, undefined, undefined>;
+export declare const wrongContextUse: import("./registerRouting.js").Routing<{
+    default: {
+        content: null;
+    };
+}, {
+    id: any;
+}, AppContext, undefined>;
+export declare const wrongStoreUse: import("./registerRouting.js").Routing<{
+    default: {
+        content: null;
+    };
+}, {
+    t: any;
+}, AppContext, AppStore>;
+declare class Base {
+    a: number;
+}
+declare class Derived extends Base {
+    b: number;
+}
+export declare const annotatedWider: import("./registerRouting.js").Routing<{
+    default: {
+        content: null;
+    };
+}, {
+    n: number;
+}, Derived, undefined>;
+declare class StoreHoldingReqRes {
+    reqRes: ReqRes | null;
+    constructor(reqRes: ReqRes | null);
+    token: string;
+}
+export declare const storeNotSerializable: import("./registerRouting.js").Routing<{
+    default: {
+        content: null;
+    };
+}, {
+    n: number;
+}, AppContext, StoreHoldingReqRes>;
+export declare const dataNotSerializable: import("./registerRouting.js").Routing<{
+    default: {
+        content: null;
+    };
+}, object, AppContext, AppStore>;
+export {};
+//# sourceMappingURL=registerRouting.types.test.d.ts.map

package/dist/routing/registerRouting.types.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"registerRouting.types.test.d.ts","sourceRoot":"","sources":["../../src/routing/registerRouting.types.test.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAgB1C,cAAM,UAAU;IACO,MAAM,EAAE,MAAM,GAAG,IAAI;gBAArB,MAAM,EAAE,MAAM,GAAG,IAAI;IACxC,IAAI;;MAAY;CACnB;AAID,cAAM,QAAQ;gBACE,MAAM,EAAE,MAAM,GAAG,IAAI;IACjC,KAAK,SAAQ;CAChB;AAKD,eAAO,MAAM,IAAI;;;;;;;wBAShB,CAAA;AAUD,eAAO,MAAM,WAAW;;;;;;yBAIvB,CAAA;AAMD,eAAO,MAAM,OAAO;;;;;;wBAGnB,CAAA;AAOD,eAAO,MAAM,eAAe;;;;;;yBAK3B,CAAA;AAED,eAAO,MAAM,aAAa;;;;;;wBAMzB,CAAA;AAOD,cAAM,IAAI;IAAG,CAAC,SAAI;CAAE;AACpB,cAAM,OAAQ,SAAQ,IAAI;IAAG,CAAC,SAAI;CAAE;AAEpC,eAAO,MAAM,cAAc;;;;;;sBAK1B,CAAA;AAWD,cAAM,kBAAkB;IACD,MAAM,EAAE,MAAM,GAAG,IAAI;gBAArB,MAAM,EAAE,MAAM,GAAG,IAAI;IACxC,KAAK,SAAQ;CAChB;AAED,eAAO,MAAM,oBAAoB;;;;;;kCAQhC,CAAA;AAED,eAAO,MAAM,mBAAmB;;;;gCAO/B,CAAA"}

package/dist/routing/registerRouting.types.test.js

@@ -0,0 +1,120 @@
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { registerRouting } from './registerRouting.js';
+/*
+ * Type tests for registerRouting()'s inference. tsc is the assertion - nothing here runs.
+ *
+ * The case that needs pinning: globalDataFunction now takes the context and the networked store,
+ * so ContextSchema and NetworkedStoreSchema are inferred from TWO argument positions each (their
+ * own, and this callback's parameters). A parameter is a contravariant inference site, so getting
+ * this wrong collapses them to never - the same way BindableSelect's Value did before NoInfer.
+ */
+const routes = {
+  default: {
+    content: null
+  }
+};
+class AppContext {
+  constructor(reqRes) {
+    _defineProperty(this, "reqRes", void 0);
+    _defineProperty(this, "user", {
+      id: 1
+    });
+    this.reqRes = reqRes;
+  }
+}
+// the networked store is serialized to the page, so every member must be JsonValue - holding the
+// reqRes on it makes it fail `NS extends Serializable<NS>` and fall back to its constraint
+class AppStore {
+  constructor(reqRes) {
+    _defineProperty(this, "token", 'abc');
+    void reqRes;
+  }
+}
+// ---- both registered: the callback sees the real classes, not never ----------
+export const both = registerRouting(() => routes, async (reqRes, context, store) => {
+  const id = context.user.id;
+  const token = store.token;
+  return await Promise.resolve({
+    id,
+    token
+  });
+}, AppContext, AppStore);
+// G still infers from the callback's return, uncontaminated by the two new parameters
+const bothData = {
+  id: 1,
+  token: 'a'
+};
+// @ts-expect-error -- and is not widened: `id` is a number
+const bothWrong = {
+  id: 'not a number',
+  token: 'a'
+};
+// ---- context only: the store parameter is undefined, not any -----------------
+export const contextOnly = registerRouting(() => routes, async (reqRes, context) => Promise.resolve({
+  id: context.user.id
+}), AppContext);
+// ---- nothing registered: a one-argument callback still satisfies the type -----
+// the parameters are additive, so an app that ignores them is unaffected
+export const neither = registerRouting(() => routes, async () => Promise.resolve({
+  count: 1
+}));
+// ---- the parameters are checked, not any ------------------------------------
+/* eslint-disable @typescript-eslint/no-unsafe-assignment -- suppressing the type error below
+   leaves the property error-typed, which is the point of the case */
+export const wrongContextUse = registerRouting(() => routes,
+// @ts-expect-error -- `nope` is not on AppContext
+async (reqRes, context) => Promise.resolve({
+  id: context.nope
+}), AppContext);
+export const wrongStoreUse = registerRouting(() => routes,
+// @ts-expect-error -- the store is AppStore, which has no `missing`
+async (reqRes, context, store) => Promise.resolve({
+  t: store.missing
+}), AppContext, AppStore);
+/* eslint-enable @typescript-eslint/no-unsafe-assignment */
+// ---- an annotated callback parameter must not redefine the context ----------
+// the context is whatever class was registered. If the callback's own annotation is allowed to
+// compete as an inference site, a wider annotation silently wins and the registered class is lost
+class Base {
+  constructor() {
+    _defineProperty(this, "a", 1);
+  }
+}
+class Derived extends Base {
+  constructor(...args) {
+    super(...args);
+    _defineProperty(this, "b", 2);
+  }
+}
+export const annotatedWider = registerRouting(() => routes, async (reqRes, context) => Promise.resolve({
+  n: context.a
+}), Derived);
+const stillDerived = annotatedContext;
+void stillDerived;
+// ---- what cannot cross the network -----------------------------------------
+// the store and the global data are both serialized into the page. Checked at the ARGUMENT, so
+// the failure names the offending class or property instead of cascading - see registerRouting.ts
+class StoreHoldingReqRes {
+  constructor(reqRes) {
+    _defineProperty(this, "reqRes", void 0);
+    _defineProperty(this, "token", 'abc');
+    this.reqRes = reqRes;
+  }
+}
+export const storeNotSerializable = registerRouting(() => routes, async () => Promise.resolve({
+  n: 1
+}), AppContext,
+// @ts-expect-error -- on THIS argument, naming the class: "'typeof StoreHoldingReqRes' is not
+// assignable to ... SerializableStore<...>" ... "The types of 'reqRes' are incompatible" ...
+// "Type 'Request' is not assignable to type 'JsonValue'"
+StoreHoldingReqRes);
+export const dataNotSerializable = registerRouting(() => routes,
+// @ts-expect-error -- on the callback, naming the property: "Types of property 'leaked' are
+// incompatible" ... "Type 'Request' is not assignable to type 'JsonValue'"
+async reqRes => Promise.resolve({
+  leaked: reqRes
+}), AppContext, AppStore);
+void bothData;
+void bothWrong;

package/dist/routing/registrationTypes.d.ts

@@ -0,0 +1,11 @@
+import type { ReqRes } from '../ReqRes.js';
+import type { RoutesWithSettings } from './Routes.js';
+import type { RoutesArray } from './routesArray.js';
+export declare const $routing: unique symbol;
+export type Fixed<T> = {
+    [$routing]: T;
+};
+export type RoutesFunctionGeneric<G extends object, C, NS, Rs extends RoutesWithSettings<G> | RoutesArray<G>> = (reqRes: ReqRes | null, context: C, networkedData: NS) => Rs;
+export type ContextInitializer<ContextSchema> = new (reqRes: ReqRes | null) => ContextSchema;
+export type NetworkedStoreInitializer<StoreSchema> = new (reqRes: ReqRes | null, context?: unknown) => StoreSchema;
+//# sourceMappingURL=registrationTypes.d.ts.map

package/dist/routing/registrationTypes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"registrationTypes.d.ts","sourceRoot":"","sources":["../../src/routing/registrationTypes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAoBnD,MAAM,CAAC,OAAO,CAAC,MAAM,QAAQ,EAAE,OAAO,MAAM,CAAA;AAI5C,MAAM,MAAM,KAAK,CAAC,CAAC,IAAI;IAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;CAAE,CAAA;AAExC,MAAM,MAAM,qBAAqB,CAC7B,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,SAAS,kBAAkB,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,IAC1E,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,aAAa,EAAE,EAAE,KAAK,EAAE,CAAA;AAEhE,MAAM,MAAM,kBAAkB,CAAC,aAAa,IAAI,KAC5C,MAAM,EAAE,MAAM,GAAG,IAAI,KACpB,aAAa,CAAA;AAIlB,MAAM,MAAM,yBAAyB,CAAC,WAAW,IAAI,KACjD,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,OAAO,CAAC,EAAE,OAAO,KAChB,WAAW,CAAA"}

package/dist/routing/registrationTypes.js

@@ -0,0 +1 @@
+export {};

package/dist/routing/resolveAppRoutes.d.ts

@@ -0,0 +1,5 @@
+import type { Mode } from '../Mode.js';
+import type { RoutesLocation } from '../FrameworkConfig.js';
+import type { AppRoutes } from './AppRoutes.js';
+export declare function resolveAppRoutes(module: Record<string, unknown>, routesLocation: RoutesLocation, mode: Mode): AppRoutes<any>;
+//# sourceMappingURL=resolveAppRoutes.d.ts.map

package/dist/routing/resolveAppRoutes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolveAppRoutes.d.ts","sourceRoot":"","sources":["../../src/routing/resolveAppRoutes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAQ/C,wBAAgB,gBAAgB,CAC5B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,cAAc,EAAE,cAAc,EAC9B,IAAI,EAAE,IAAI,GACX,SAAS,CAAC,GAAG,CAAC,CAgChB"}

package/dist/routing/resolveAppRoutes.js

@@ -0,0 +1,25 @@
+import { TungstenError } from '../TungstenError.js';
+import { routesLocationParts } from '../routesLocationParts.js';
+import { registeredRouting } from './routingRegistry.js';
+// routes come from registerRouting() or from routesLocation's named export. The module has already
+// been imported by the caller, which is what runs the registerRouting() call
+export function resolveAppRoutes(module, routesLocation, mode) {
+  const {
+    routesFile,
+    routeExport
+  } = routesLocationParts(routesLocation);
+  const registered = registeredRouting.value;
+  const isExported = routeExport !== undefined && routeExport in module;
+  // both systems in one app is almost always a mistake, so say so while it is cheap to fix
+  if (registered !== undefined && isExported && mode === 'dev') {
+    throw new TungstenError(`Routes are set twice: registerRouting() was called, and routes file ${routesFile}` + ` exports ${routeExport} (config.routesLocation). Use one or the other - drop the` + ` export name from routesLocation to keep registerRouting().`);
+  }
+  if (registered !== undefined) return registered;
+  if (isExported) {
+    return module[routeExport]; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+  }
+  if (routeExport === undefined) {
+    throw new TungstenError(`No routes. config.routesLocation names the file ${routesFile} without an export name,` + ` so routes must come from registerRouting(), but ${routesFile} did not call it.`);
+  }
+  throw new TungstenError(`Could not find an export named ${routeExport} in routes file ${routesFile},` + ` and registerRouting() was not called.` + ` These settings are set in config.routesLocation.`);
+}

package/dist/routing/routeUrl.d.ts

@@ -1,4 +1,8 @@
 import type { SiteBasePath } from '../render/HeadData.js';
 export declare function routeKeyToUrl(routeKey: string, siteBasePath: SiteBasePath, staticFiles: boolean): string;
 export declare function urlToRouteKey(pathname: string, siteBasePath: SiteBasePath, staticFiles: boolean): string;
+export declare function urlToLocation(url: {
+    pathname: string;
+    search: string;
+}, siteBasePath: SiteBasePath, staticFiles: boolean): string;
 //# sourceMappingURL=routeUrl.d.ts.map

package/dist/routing/routeUrl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routeUrl.d.ts","sourceRoot":"","sources":["../../src/routing/routeUrl.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AAOzD,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,GAAG,MAAM,CASxG;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,GAAG,MAAM,CAWxG"}
+{"version":3,"file":"routeUrl.d.ts","sourceRoot":"","sources":["../../src/routing/routeUrl.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AAOzD,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,GAAG,MAAM,CASxG;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,GAAG,MAAM,CAWxG;AAGD,wBAAgB,aAAa,CACzB,GAAG,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,GAC5F,MAAM,CAER"}

package/dist/routing/routeUrl.js

@@ -20,4 +20,8 @@ export function urlToRouteKey(pathname, siteBasePath, staticFiles) {
     if (path.endsWith('/index.html')) path = path.slice(0, -'index.html'.length);else if (path.endsWith('.html')) path = path.slice(0, -'.html'.length);
   }
   return path;
+}
+// the app's location for a browser URL: route path plus query, as the server sees it (no fragment)
+export function urlToLocation(url, siteBasePath, staticFiles) {
+  return urlToRouteKey(url.pathname, siteBasePath, staticFiles) + url.search;
 }