@wrnrlr/prelude 0.2.3 → 0.2.10

package/.github/workflows/publish.yml

@@ -1,41 +1,57 @@
-name: Publish
+name: Prelude CI/CD
 
 on:
   push:
     branches:
       - main
-
-permissions:
-  contents: read
-  pages: write
-  id-token: write
+      - release
 
 jobs:
-  publish:
+  test:
     runs-on: ubuntu-latest
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
+    # if: github.ref == 'refs/heads/main'
     steps:
-      - name: Check out the repository to the runner
+      - name: Checkout the repository
         uses: actions/checkout@v4
-
       - name: Setup Deno
         uses: denoland/setup-deno@v2
         with:
           deno-version: v2.x
-
       - name: Deno install
         run: deno install
-
       # - name: Lint
       #   run: deno lint
-
       - name: Run tests
         run: deno task test
+  publish:
+    needs: test
+    if: github.ref == 'refs/heads/release'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
 
-      - name: Build
-        run: deno task build
+      - name: Setup Deno
+        uses: denoland/setup-deno@v2
+        with:
+          deno-version: v2.x
+
+      - name: Publish to JSR
+        run: deno publish --allow-slow-types --allow-dirty
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          registry-url: 'https://registry.npmjs.org/'
+
+      - name: Publish to NPM
+        run: npm publish --access public
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       # Moving artifacts, website and docs into their own project...
       # - name: Setup Pages
@@ -49,10 +65,3 @@ jobs:
       # - name: Deploy to GitHub Pages
         # id: deployment
         # uses: actions/deploy-pages@v4
-
-      # - name: Setup NPM
-      #   run: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > /home/runner/.npmrc
-      #   env:
-      #     NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-      # - name: Run release script
-      #   run: /home/runner/.deno/bin/deno task release

package/deno.jsonc

@@ -1,6 +1,6 @@
 {
   "name": "@wrnrlr/prelude",
-  "version": "0.2.3",
+  "version": "0.2.10",
   "exports": "./src/mod.ts",
   "compilerOptions": {
     "strict": true,
@@ -11,18 +11,16 @@
     "@std/fs": "jsr:@std/fs@^1.0.5",
     "@std/path": "jsr:@std/path@^1.0.6",
     "@std/testing": "jsr:@std/testing@^0.225.3",
-    "happy-dom": "npm:happy-dom@^17.1.0",
-    "typedoc": "npm:typedoc@^0.26.6",
-    "vite": "npm:vite@^5.4.9",
-    "esbuild": "npm:esbuild@^0.24.0"
+    "happy-dom": "npm:happy-dom@^17.1.0"
   },
   "tasks": {
     "dev": "deno run -A npm:vite --config www/vite.config.js",
     "test": "deno test -A ./test/*.[jt]s",
-    "release": "deno publish --allow-slow-types --allow-dirty && npm publish --access public"
+    "release": "git push origin main:release"
   },
   "lint": {
-    "include": ["src"]
+    "include": ["src"],
+    "exclude": ["src/runtime.ts"]
   },
   "fmt": {
     "lineWidth": 120,

package/example/checkbox.html

@@ -15,9 +15,9 @@ function Checkbox(props) {
 }
 
 function App() {
-  const todos = signal([true,false])
-  // const obj = signal({todos:[true]})
-  // const todos = wrap(obj,'todos')
+  // const todos = signal([true,false])
+  const obj = signal({todos:[true]})
+  const todos = wrap(obj,'todos')
   const first = wrap(todos, 0)
   const removeItem = i => {
     // console.log('remove', i)

package/package.json

@@ -1,14 +1,10 @@
 {
   "name": "@wrnrlr/prelude",
   "type": "module",
-  "version": "0.2.3",
+  "version": "0.2.10",
   "author": "Werner Laurensse",
   "description": "A signal based frontend library with fine-grained reactivity",
   "main": "./src/mod.ts",
   "scripts": {},
-  "dependencies": {
-    "@codemirror/lang-html": "^6.4.9",
-    "codemirror": "^6.0.1",
-    "happy-dom": "^17.1.0"
-  }
+  "dependencies": {}
 }

package/src/controlflow.ts

@@ -82,8 +82,10 @@ export function listArray<T, U extends Mountable>(
     disposeList(items)
   })
 
+  let newItems
+
   return () => {
-    const newItems = typeof list==='function' ? list() || [] : list;
+    newItems = typeof list==='function' ? list() || [] : list;
     return untrack(() => {
       if (newItems.length > 0 && fallbackDisposer) {
         fallbackDisposer();
@@ -186,7 +188,7 @@ export function listArray<T, U extends Mountable>(
       return (mapped = temp);
     })
   }
-  function newValueGetter(a:unknown) { console.log({a}); return newValue }
+  function newValueGetter() { return newValue }
   function changeBoth() {
     item!.index = i!
     item!.indexSetter?.(i)
@@ -204,10 +206,11 @@ export function listArray<T, U extends Mountable>(
     let sV = (...a) => {
       sV = (...a) => {
         if (a.length===0) {
-          return list()[sI()]
+          return newItems[t.index]
         } else {
-          const k = untrack(sI)
-          return list(b => b.toSpliced(k, 1, typeof a[0] === 'function' ? a[0]() : a[0])).at(k)
+          const k = t.index
+          const b = newItems.toSpliced(k, 1, typeof a[0] === 'function' ? a[0]() : a[0])
+          return list(b).at(k)
         }
       }
       t.valueSetter = sV

package/src/resource.js

@@ -1,5 +1,5 @@
 // @ts-nocheck:
-import {signal,effect,untrack,memo,batch,useContext,onCleanup} from './reactive.ts'
+import {signal,effect,untrack,memo,batch,onCleanup} from './reactive.ts'
 
 const NO_INIT = {}
 

package/src/runtime.ts

@@ -339,7 +339,7 @@ function setAttribute(node: Element, name: string, value?: string): undefined {
 }
 
 function setAttributeNS(node:Node, ns:string, name:string, value?:string):void {
-  value ? node.setAttributeNS(ns, name, value) : node.removeAttributeNS(ns, name)
+  value===undefined || value===null ? node.setAttributeNS(ns, name, value) : node.removeAttributeNS(ns, name)
 }
 
 function addEventListener(node: Element, name: string, handler:((e:Event)=>void), delegate:boolean): void {

package/test/list.js

@@ -25,10 +25,10 @@ import { listArray } from '../src/controlflow.ts'
 //   l(l => [3, ...l])
 //   assertEquals(r(), [{e:3,i:0}, {e:0,i:1}, {e:1,i:2}, {e:2,i:3}])
 // })
-const l1 = signal(['a'])
-const r1 = listArray(l1, (e,i)=>([i(),e()]))
+// const l1 = signal(['a'])
+// const r1 = listArray(l1, (e,i)=>([i(),e()]))
 // r1()
-l1(l => ['x', ...l])
+// l1(l => ['x', ...l])
 // l1(l => [...l, 'x', 'y'])
-console.log(JSON.stringify(r1()))
+// console.log(JSON.stringify(r1()))
 // assertEquals(r(), )

package/test/reactive.js

@@ -128,7 +128,6 @@ describe('wrap', ()=>{
     const obj = signal({todos:[{done:false,name:'a'}, {done:false,name:'b'}]}), todos = wrap(obj, 'todos'), todo = wrap(todos, 0),
       name = wrap(todo, 'name'), done = wrap(todo,'done')
     assertEquals(done(true),true)
-    console.log('OBJ',obj())
     effect(()=>{
       name();done()
     })