fragtml 0.0.1 → 0.0.2

package/lib/create-tag.d.ts

@@ -5,10 +5,12 @@ export type RenderOptions = {
 export type CompiledTemplate = {
     strings: readonly string[];
 };
-export type HtmlTag = ((strings: TemplateStringsArray | readonly string[], ...substitutions: unknown[]) => HtmlResult) & ((options?: RenderOptions | string) => HtmlTag) & {
+export type HtmlTag = ((strings: TemplateStrings, ...substitutions: HtmlSubstitution[]) => HtmlResult) & ((options?: RenderOptions | string) => HtmlTag) & {
     fragment: FragmentHelpers;
     raw: (value: unknown) => RawHtml;
 };
+import type { TemplateStrings } from './html-types.js';
+import type { HtmlSubstitution } from './html-types.js';
 import { HtmlResult } from './html-result.js';
 import type { FragmentHelpers } from './fragment.js';
 import type { RawHtml } from './raw.js';

package/lib/create-tag.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-tag.d.ts","sourceRoot":"","sources":["create-tag.js"],"names":[],"mappings":"AA+EA,mBADW,OAAO,CACoB;;iBArExB,MAAM,GAAG,SAAS;;;aAKlB,SAAS,MAAM,EAAE;;sBAmElB,CAAC,CAAC,OAAO,EAAE,oBAAoB,GAAG,SAAS,MAAM,EAAE,EAAE,GAAG,aAAa,EAAE,OAAO,EAAE,KAAK,UAAU,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,MAAM,KAAK,OAAO,CAAC,GAAG;IAAE,QAAQ,EAAE,eAAe,CAAC;IAAC,GAAG,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAA;CAAE;2BA9EtM,kBAAkB;qCAJR,eAAe;6BACvB,UAAU"}
+{"version":3,"file":"create-tag.d.ts","sourceRoot":"","sources":["create-tag.js"],"names":[],"mappings":"AAqFA,mBADW,OAAO,CACoB;;iBA1ExB,MAAM,GAAG,SAAS;;;aAKlB,SAAS,MAAM,EAAE;;sBAwElB,CAAC,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,aAAa,EAAE,gBAAgB,EAAE,KAAK,UAAU,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,MAAM,KAAK,OAAO,CAAC,GAAG;IAAE,QAAQ,EAAE,eAAe,CAAC;IAAC,GAAG,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAA;CAAE;qCAvF1J,iBAAiB;sCAAjB,iBAAiB;2BAI7C,kBAAkB;qCALR,eAAe;6BAEvB,UAAU"}

package/lib/create-tag.js

@@ -1,4 +1,5 @@
 /** @import { FragmentHelpers } from './fragment.js' */
+/** @import { HtmlSubstitution, TemplateStrings } from './html-types.js' */
 /** @import { RawHtml } from './raw.js' */
 
 import { createFragmentHelpers } from './fragment.js'
@@ -56,8 +57,11 @@ function normalizeOptions (options) {
  * @returns {HtmlTag}
  */
 function createBoundTag (options) {
-  // eslint-disable-next-line @stylistic/no-extra-parens
-  const tag = /** @type {HtmlTag} */ (function tag (strings, ...substitutions) {
+  /**
+   * @param {TemplateStrings | RenderOptions | string | undefined} strings
+   * @param {...HtmlSubstitution} substitutions
+   */
+  function tag (strings, ...substitutions) {
     if (!isTemplateStrings(strings)) {
       return createBoundTag(normalizeOptions(/** @type {RenderOptions | string | undefined} */ strings))
     }
@@ -68,17 +72,19 @@ function createBoundTag (options) {
       options,
       renderResult
     )
-  })
+  }
 
-  tag.fragment = fragment
-  tag.raw = raw
+  const htmlTag = /** @type {HtmlTag} */ (tag)
 
-  return tag
+  htmlTag.fragment = fragment
+  htmlTag.raw = raw
+
+  return htmlTag
 }
 
 /** @type {HtmlTag} */
 export const html = createBoundTag({})
 
 /**
- * @typedef {((strings: TemplateStringsArray | readonly string[], ...substitutions: unknown[]) => HtmlResult) & ((options?: RenderOptions | string) => HtmlTag) & { fragment: FragmentHelpers, raw: (value: unknown) => RawHtml }} HtmlTag
+ * @typedef {((strings: TemplateStrings, ...substitutions: HtmlSubstitution[]) => HtmlResult) & ((options?: RenderOptions | string) => HtmlTag) & { fragment: FragmentHelpers, raw: (value: unknown) => RawHtml }} HtmlTag
  */

package/lib/html-result.d.ts

@@ -1,9 +1,9 @@
 export function isHtmlResult(value: unknown): value is HtmlResult;
 export const htmlResultSymbol: unique symbol;
 export class HtmlResult {
-    constructor(compiled: CompiledTemplate, substitutions: unknown[], options: RenderOptions, render: (result: HtmlResult) => string);
+    constructor(compiled: CompiledTemplate, substitutions: HtmlSubstitution[], options: RenderOptions, render: (result: HtmlResult) => string);
     compiled: CompiledTemplate;
-    substitutions: unknown[];
+    substitutions: HtmlSubstitution[];
     options: RenderOptions;
     render: (result: HtmlResult) => string;
     toString(): string;
@@ -12,5 +12,6 @@ export class HtmlResult {
     [htmlResultSymbol]: boolean;
 }
 import type { CompiledTemplate } from './create-tag.js';
+import type { HtmlSubstitution } from './html-types.js';
 import type { RenderOptions } from './create-tag.js';
 //# sourceMappingURL=html-result.d.ts.map

package/lib/html-result.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"html-result.d.ts","sourceRoot":"","sources":["html-result.js"],"names":[],"mappings":"AAoCA,oCAHW,OAAO,GACL,KAAK,IAAI,UAAU,CAQ/B;AAxCD,6CAA4D;AAE5D;IAOE,sBALW,gBAAgB,iBAChB,OAAO,EAAE,WACT,aAAa,UACb,CAAC,MAAM,EAAE,UAAU,KAAK,MAAM,EAQxC;IAJC,2BAAwB;IACxB,yBAAkC;IAClC,uBAAsB;IACtB,iBAPkB,UAAU,KAAK,MAAM,CAOnB;IAGtB,mBAEC;IAED,kBAEC;IAED,+BAEC;IAjBC,4BAA6B;CAkBhC;sCA9BoD,iBAAiB;mCAAjB,iBAAiB"}
+{"version":3,"file":"html-result.d.ts","sourceRoot":"","sources":["html-result.js"],"names":[],"mappings":"AAqCA,oCAHW,OAAO,GACL,KAAK,IAAI,UAAU,CAQ/B;AAxCD,6CAA4D;AAE5D;IAOE,sBALW,gBAAgB,iBAChB,gBAAgB,EAAE,WAClB,aAAa,UACb,CAAC,MAAM,EAAE,UAAU,KAAK,MAAM,EAQxC;IAJC,2BAAwB;IACxB,kCAAkC;IAClC,uBAAsB;IACtB,iBAPkB,UAAU,KAAK,MAAM,CAOnB;IAGtB,mBAEC;IAED,kBAEC;IAED,+BAEC;IAjBC,4BAA6B;CAkBhC;sCA/BoD,iBAAiB;sCAChC,iBAAiB;mCADF,iBAAiB"}

package/lib/html-result.js

@@ -1,11 +1,12 @@
 /** @import { CompiledTemplate, RenderOptions } from './create-tag.js' */
+/** @import { HtmlSubstitution } from './html-types.js' */
 
 export const htmlResultSymbol = Symbol('fragtml.htmlResult')
 
 export class HtmlResult {
   /**
    * @param {CompiledTemplate} compiled
-   * @param {unknown[]} substitutions
+   * @param {HtmlSubstitution[]} substitutions
    * @param {RenderOptions} options
    * @param {(result: HtmlResult) => string} render
    */

package/lib/html-types.d.ts

@@ -0,0 +1,9 @@
+import type { FragmentBoundary } from './fragment.js';
+import type { HtmlResult } from './html-result.js';
+import type { RawHtml } from './raw.js';
+export type HtmlPrimitiveSubstitution = string | number | bigint | boolean | null | undefined;
+export type HtmlArrayScalarSubstitution = HtmlPrimitiveSubstitution | HtmlResult | RawHtml;
+export type HtmlArraySubstitution = HtmlArrayScalarSubstitution | readonly HtmlArraySubstitution[];
+export type HtmlSubstitution = HtmlArraySubstitution | FragmentBoundary;
+export type TemplateStrings = TemplateStringsArray | readonly string[];
+//# sourceMappingURL=html-types.d.ts.map

package/lib/html-types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"html-types.d.ts","sourceRoot":"","sources":["html-types.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAEvC,MAAM,MAAM,yBAAyB,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAAA;AAC7F,MAAM,MAAM,2BAA2B,GAAG,yBAAyB,GAAG,UAAU,GAAG,OAAO,CAAA;AAC1F,MAAM,MAAM,qBAAqB,GAAG,2BAA2B,GAAG,SAAS,qBAAqB,EAAE,CAAA;AAClG,MAAM,MAAM,gBAAgB,GAAG,qBAAqB,GAAG,gBAAgB,CAAA;AACvE,MAAM,MAAM,eAAe,GAAG,oBAAoB,GAAG,SAAS,MAAM,EAAE,CAAA"}

package/lib/html-types.ts

@@ -0,0 +1,10 @@
+// Type exports only. Do not add runtime implementations to this module.
+import type { FragmentBoundary } from './fragment.js'
+import type { HtmlResult } from './html-result.js'
+import type { RawHtml } from './raw.js'
+
+export type HtmlPrimitiveSubstitution = string | number | bigint | boolean | null | undefined
+export type HtmlArrayScalarSubstitution = HtmlPrimitiveSubstitution | HtmlResult | RawHtml
+export type HtmlArraySubstitution = HtmlArrayScalarSubstitution | readonly HtmlArraySubstitution[]
+export type HtmlSubstitution = HtmlArraySubstitution | FragmentBoundary
+export type TemplateStrings = TemplateStringsArray | readonly string[]

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fragtml",
   "description": "WIP - nothing to see here",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "author": "Bret Comnes <bcomnes@gmail.com> (https://bret.io)",
   "bugs": {
     "url": "https://github.com/bcomnes/fragtml/issues"
@@ -48,7 +48,7 @@
     "build:declaration": "tsc -p declaration.tsconfig.json",
     "clean": "run-p clean:*",
     "clean:declarations-top": "rm -rf $(find . -maxdepth 1 -type f -name '*.d.ts*')",
-    "clean:declarations-lib": "rm -rf $(find lib -type f -name '*.d.ts*' ! -name '*-types.d.ts')"
+    "clean:declarations-lib": "rm -rf $(find lib -type f -name '*.d.ts*')"
   },
   "funding": {
     "type": "individual",