fix erroneous fragment duplication

Author: wesselvdv

package.json

@@ -40,6 +40,7 @@
     "@tsplus/stdlib": "0.1.8",
     "@types/node": "^18.0.0",
     "@types/rimraf": "^3.0.2",
+    "@types/webpack": "5.28.0",
     "@typescript-eslint/eslint-plugin": "^5.29.0",
     "@typescript-eslint/parser": "^5.29.0",
     "babel-plugin-annotate-pure-calls": "^0.4.0",
@@ -56,10 +57,13 @@
     "madge": "^5.0.1",
     "picocolors": "^1.0.0",
     "rimraf": "^3.0.2",
+    "ts-loader": "9.3.0",
     "typescript": "^4.7.4",
     "ultra-runner": "^3.10.5",
     "vite": "^2.9.12",
-    "vitest": "0.15.2"
+    "vitest": "0.15.2",
+    "webpack": "5.73.0",
+    "webpack-cli": "4.10.0"
   },
   "resolutions": {
     "eslint-plugin-codegen": "patch:eslint-plugin-codegen@npm:0.16.1#.yarn/patches/eslint-plugin-codegen-npm-0.16.1-87770191cd"

packages/html/.babel.mjs.json

@@ -1,15 +1,15 @@
 {
-  "plugins": [
-      [
-          "replace-import-extension",
-          {
-              "extMapping": {
-                  ".js": ".mjs"
-              }
-          }
-      ],
-      [
-          "annotate-pure-calls"
-      ]
-  ]
+    "plugins": [
+        [
+            "replace-import-extension",
+            {
+                "extMapping": {
+                    ".js": ".mjs"
+                }
+            }
+        ],
+        [
+            "annotate-pure-calls"
+        ]
+    ]
 }

packages/html/_src/data/Hole/operations/toEntry.ts

@@ -11,9 +11,11 @@ export function toEntry(
 
   return TemplateCache.getOrElseEffect(self.template, TemplateCache.set(self.template, self.toTemplate)).flatMap((
     template
-  ) =>
-    template.updates.flatMap((updates) =>
-      Entry(self.type, self.template, template.toDocumentFragment, updates.toImmutableArray)
+  ) => {
+    const fragment = template.toDocumentFragment
+
+    return template.updates(fragment).flatMap((updates) =>
+      Entry(self.type, self.template, fragment, updates.toImmutableArray)
     )
-  )
+  })
 }

packages/html/_src/data/Template/operations/updates.ts

@@ -369,7 +369,7 @@ function anyContent(
                   }).as(_)
                 ).catchAll(() => Effect.succeed(() => document.createTextNode(String(newValue)))).asSome()
               ).flatMap((_) => Effect.fromMaybe(_).mapError(() => new Template.NoTextNodeException())).flatMap((text) =>
-                nodesRef.updateEffect((nodes) => diff(comment, nodes, [text]))
+                nodesRef.updateAndGetEffect((nodes) => diff(comment, nodes, [text]))
               ).as(newValue).asSome()
             )
           }
@@ -695,10 +695,11 @@ function handlers(
 }
 
 /**
- * @tsplus getter ets/Template updates
+ * @tsplus fluent ets/Template updates
  */
 export function updates(
-  self: Template
+  self: Template,
+  fragment: DocumentFragment
 ): Effect<
   never,
   Template.InvalidElementException | Template.MissingNodeException,
@@ -721,5 +722,5 @@ export function updates(
 > {
   concreteTemplate(self)
   // relate an update handler per each node that needs one
-  return Chunk.from(self.nodes).mapEffect(handlers(self.toDocumentFragment))
+  return Chunk.from(self.nodes).mapEffect(handlers(fragment))
 }

packages/html/_src/data/Wire/operations/valueOf.ts

@@ -9,7 +9,6 @@ export function valueOf(
   concreteWire(self)
 
   return self.fragment.updateSomeAndGetEffect((fragment) => {
-    console.log(fragment.childNodes.length, self.nodes.length, self.nodes)
     if (fragment.childNodes.length !== self.nodes.length) {
       return Maybe.some(Effect.succeed(() => fragment.append(...self.nodes)).as(fragment))
     }

packages/html/_src/render.ts

@@ -85,10 +85,9 @@ export function render<A extends Element, R, E, B extends (Hole | HTMLOrSVGEleme
             // (wires are basically persistent fragments facades with special behavior)
             return (Wire.isWire(wire.value) ?
               wire.value.valueOf :
-              Effect.succeed(wire.value.valueOf() as Node)).flatMap((node) => {
-                console.log(where, node)
-                return Effect.succeed(() => where.replaceChildren(node))
-              }).as(where)
+              Effect.succeed(wire.value.valueOf() as Node)).flatMap((node) =>
+                Effect.succeed(() => where.replaceChildren(node))
+              ).as(where)
           }
           return Effect.succeed(where)
         }

packages/html/_test/global.d.ts

@@ -9,8 +9,8 @@
   },
   "scripts": {
     "clean": "yarn org:rimraf build tsbuildinfo dist",
-    "build-cjs": "yarn org:babel build/esm --config-file ./.babel.cjs.json --out-dir build/cjs --out-file-extension .js --source-maps",
-    "build-mjs": "yarn org:babel build/esm --config-file ./.babel.mjs.json --out-dir build/mjs --out-file-extension .mjs --source-maps",
+    "build-cjs": "yarn org:babel build/esm --config-file ./.babel.cjs.json --out-dir build/cjs --out-file-extension .js --source-maps inline",
+    "build-mjs": "yarn org:babel build/esm --config-file ./.babel.mjs.json --out-dir build/mjs --out-file-extension .mjs --source-maps inline",
     "build-post": "yarn org:build-utils pack-v3",
     "build-pack": "yarn org:tsc -b tsconfig.json && yarn org:concurrently \"yarn build-cjs\" \"yarn build-mjs\" && yarn build-post",
     "lint": "yarn org:eslint . --ext .ts,.tsx",
@@ -43,11 +43,7 @@
     "@tsplus/stdlib": "0.1.8"
   },
   "devDependencies": {
-    "@types/node": "18.0.0",
-    "@types/webpack": "5.28.0",
-    "ts-loader": "9.3.0",
-    "webpack": "5.73.0",
-    "webpack-cli": "4.10.0"
+    "@types/node": "18.0.0"
   },
   "tsplus": {
     "typeDir": "./build/dts"

packages/html/package.json

@@ -4,7 +4,7 @@ module.exports = {
   experiments: {
     outputModule: true
   },
-  entry: path.resolve(__dirname, "./_src/render.ts"),
+  entry: path.resolve(__dirname, "./packages/html/_src/render.ts"),
   module: {
     rules: [
       {
@@ -31,7 +31,7 @@ module.exports = {
   },
   devtool: "inline-source-map",
   output: {
-    path: path.resolve(__dirname, "./build/web"),
+    path: path.resolve(__dirname, "./packages/html/build/web"),
     filename: "index.js",
     library: {
       type: "module"

packages/html/webpack.config.cjs webpack.config.cjs

@@ -638,10 +638,6 @@ __metadata:
     "@effect/core": 0.0.5
     "@tsplus/stdlib": 0.1.8
     "@types/node": 18.0.0
-    "@types/webpack": 5.28.0
-    ts-loader: 9.3.0
-    webpack: 5.73.0
-    webpack-cli: 4.10.0
   languageName: unknown
   linkType: soft
 
@@ -2893,6 +2889,7 @@ __metadata:
     "@tsplus/stdlib": 0.1.8
     "@types/node": ^18.0.0
     "@types/rimraf": ^3.0.2
+    "@types/webpack": 5.28.0
     "@typescript-eslint/eslint-plugin": ^5.29.0
     "@typescript-eslint/parser": ^5.29.0
     babel-plugin-annotate-pure-calls: ^0.4.0
@@ -2909,10 +2906,13 @@ __metadata:
     madge: ^5.0.1
     picocolors: ^1.0.0
     rimraf: ^3.0.2
+    ts-loader: 9.3.0
     typescript: ^4.7.4
     ultra-runner: ^3.10.5
     vite: ^2.9.12
     vitest: 0.15.2
+    webpack: 5.73.0
+    webpack-cli: 4.10.0
   languageName: unknown
   linkType: soft