@jdeighan/coffee-utils 13.0.11 → 13.0.12

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "13.0.11",
+	"version": "13.0.12",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {
@@ -52,8 +52,6 @@
 	"dependencies": {
 		"@jdeighan/base-utils": "^2.0.8",
 		"cross-env": "^7.0.3",
-		"immer": "^9.0.16",
-		"js-yaml": "^4.1.0",
 		"n-readlines": "^1.0.1",
 		"readline-sync": "^1.4.10",
 		"svelte": "^3.55.0"

package/src/DataStores.coffee

@@ -4,13 +4,12 @@ import pathlib from 'path'
 import {writable, readable, get} from 'svelte/store'
 
 import {assert, croak} from '@jdeighan/base-utils'
-import {undef, pass} from '@jdeighan/coffee-utils'
+import {fromTAML} from '@jdeighan/base-utils/taml'
+import {undef, pass, range} from '@jdeighan/coffee-utils'
 import {localStore} from '@jdeighan/coffee-utils/browser'
 import {
 	withExt, slurp, barf, newerDestFileExists,
 	} from '@jdeighan/coffee-utils/fs'
-import {fromTAML} from '@jdeighan/coffee-utils/taml'
-import {createDraft, finishDraft, produce} from 'immer'
 
 # ---------------------------------------------------------------------------
 
@@ -59,58 +58,51 @@ export class BaseDataStore
 
 # ---------------------------------------------------------------------------
 
-export class ImmerDataStore extends BaseDataStore
-
-	constructor: () ->
-		super []    # initialize with an empty array
-
-	getNewState: () ->
-
-		return produce state, draft =>
-			@addGift draft, description, image
-		return
-
-	addGift: (draft, description, image) ->
-		draft.push {
-			id: 1
-			description
-			image
-			}
-
-# ---------------------------------------------------------------------------
-
 export class ToDoDataStore
-	# --- implemented with immer
+	# --- implement without using svelte's readable or writable
 
 	constructor: () ->
 		@lToDos = []
-		@lSubscribers = []
+		@lSubscribers = []  # --- array of callback functions
 
-	subscribe: (func) ->
-		func(@lToDos)
-		@lSubscribers.push func
+	subscribe: (cbFunc) ->
+		cbFunc(@lToDos)
+		@lSubscribers.push cbFunc
 		return () ->
-			index = @lSubscribers.indexOf func
+			index = @lSubscribers.indexOf cbFunc
 			@lSubscribers.splice index, 1
 
 	alertSubscribers: () ->
-		for func in @lSubscribers
-			func(@lToDos)
+		for cbFunc in @lSubscribers
+			cbFunc(@lToDos)
 		return
 
-	set: (value) ->
-		# --- Set new value
-		@alertSubscribers()
+	find: (name) ->
+		# --- returns index
+		for index in range(@lToDos.length)
+			if (@lToDos[index].text == name)
+				return index
+		return undef
 
-	update: (func) ->
-		# --- Update value
+	clear: () ->
+		# --- Set new value
+		@lToDos = []
 		@alertSubscribers()
+		return
 
 	add: (name) ->
+		if defined(@find(name))
+			croak "Attempt to add duplicate #{name} todo"
 		@lToDos.push {
 			text: name
 			done: false
 			}
+		@alertSubscribers()
+		return
+
+	remove: (name) ->
+		index = @find(name)
+		@lToDos.splice index, 1
 		return
 
 # ---------------------------------------------------------------------------

package/src/DataStores.js

@@ -13,9 +13,14 @@ import {
   croak
 } from '@jdeighan/base-utils';
 
+import {
+  fromTAML
+} from '@jdeighan/base-utils/taml';
+
 import {
   undef,
-  pass
+  pass,
+  range
 } from '@jdeighan/coffee-utils';
 
 import {
@@ -29,16 +34,6 @@ import {
   newerDestFileExists
 } from '@jdeighan/coffee-utils/fs';
 
-import {
-  fromTAML
-} from '@jdeighan/coffee-utils/taml';
-
-import {
-  createDraft,
-  finishDraft,
-  produce
-} from 'immer';
-
 // ---------------------------------------------------------------------------
 export var WritableDataStore = class WritableDataStore {
   constructor(value = undef) {
@@ -97,70 +92,67 @@ export var BaseDataStore = class BaseDataStore {
 
 };
 
-// ---------------------------------------------------------------------------
-export var ImmerDataStore = class ImmerDataStore extends BaseDataStore {
-  constructor() {
-    super([]); // initialize with an empty array
-  }
-
-  getNewState() {
-    return produce(state, draft(() => {
-      return this.addGift(draft, description, image);
-    }));
-  }
-
-  addGift(draft, description, image) {
-    return draft.push({
-      id: 1,
-      description,
-      image
-    });
-  }
-
-};
-
 // ---------------------------------------------------------------------------
 export var ToDoDataStore = class ToDoDataStore {
-  // --- implemented with immer
+  // --- implement without using svelte's readable or writable
   constructor() {
     this.lToDos = [];
-    this.lSubscribers = [];
+    this.lSubscribers = []; // --- array of callback functions
   }
 
-  subscribe(func) {
-    func(this.lToDos);
-    this.lSubscribers.push(func);
+  subscribe(cbFunc) {
+    cbFunc(this.lToDos);
+    this.lSubscribers.push(cbFunc);
     return function() {
       var index;
-      index = this.lSubscribers.indexOf(func);
+      index = this.lSubscribers.indexOf(cbFunc);
       return this.lSubscribers.splice(index, 1);
     };
   }
 
   alertSubscribers() {
-    var func, i, len, ref;
+    var cbFunc, i, len, ref;
     ref = this.lSubscribers;
     for (i = 0, len = ref.length; i < len; i++) {
-      func = ref[i];
-      func(this.lToDos);
+      cbFunc = ref[i];
+      cbFunc(this.lToDos);
     }
   }
 
-  set(value) {
-    // --- Set new value
-    return this.alertSubscribers();
+  find(name) {
+    var i, index, len, ref;
+    ref = range(this.lToDos.length);
+    // --- returns index
+    for (i = 0, len = ref.length; i < len; i++) {
+      index = ref[i];
+      if (this.lToDos[index].text === name) {
+        return index;
+      }
+    }
+    return undef;
   }
 
-  update(func) {
-    // --- Update value
-    return this.alertSubscribers();
+  clear() {
+    // --- Set new value
+    this.lToDos = [];
+    this.alertSubscribers();
   }
 
   add(name) {
+    if (defined(this.find(name))) {
+      croak(`Attempt to add duplicate ${name} todo`);
+    }
     this.lToDos.push({
       text: name,
       done: false
     });
+    this.alertSubscribers();
+  }
+
+  remove(name) {
+    var index;
+    index = this.find(name);
+    this.lToDos.splice(index, 1);
   }
 
 };

package/src/GiftSet.coffee

@@ -1,61 +0,0 @@
-# GiftSet.coffee
-
-import {produce, enableMapSet} from 'immer'
-import {assert, croak, LOG, LOGVALUE} from '@jdeighan/base-utils'
-import {
-	dbgEnter, dbgReturn, dbg,
-	} from '@jdeighan/base-utils/debug'
-import {
-	undef, defined, notdefined, OL,
-	isString, isNonEmptyString, isArray, isHash, isArrayOfStrings,
-	isEmpty, nonEmpty,
-	} from '@jdeighan/coffee-utils'
-
-enableMapSet()
-
-# ---------------------------------------------------------------------------
-
-export LOGMAP = (label, map) ->
-
-	lLines = ["MAP #{label}:"]
-	for [key, value] from map.entries()
-		lLines.push "   #{OL(key)}: #{OL(value)}"
-	LOG lLines.join("\n")
-	LOG()
-	return
-
-# ---------------------------------------------------------------------------
-
-export addGift = produce (draft, giftName, hData={}) ->
-
-	assert (draft instanceof Map), "draft is not a Map"
-	if draft.get giftName
-		throw new Error("Gift #{giftName} already exists")
-	hValue = {hData...}
-	hValue.name = giftName
-	draft.set giftName, hValue
-	return
-
-# ---------------------------------------------------------------------------
-
-export reserveGift = produce (draft, giftName, user) ->
-
-	assert (draft instanceof Map), "draft is not a Map"
-	gift = draft.get giftName
-	assert gift?, "No such gift: #{giftName}"
-	gift.reservedBy = user
-	return
-
-# ---------------------------------------------------------------------------
-
-export cancelReservation = produce (draft, giftName) ->
-
-	assert (draft instanceof Map), "draft is not a Map"
-	gift = draft.get giftName
-	assert defined(gift), "No such gift: #{giftName}"
-	delete gift.reservedBy
-	return
-
-# ---------------------------------------------------------------------------
-
-

package/src/GiftSet.js

@@ -1,80 +0,0 @@
-// Generated by CoffeeScript 2.7.0
-  // GiftSet.coffee
-import {
-  produce,
-  enableMapSet
-} from 'immer';
-
-import {
-  assert,
-  croak,
-  LOG,
-  LOGVALUE
-} from '@jdeighan/base-utils';
-
-import {
-  dbgEnter,
-  dbgReturn,
-  dbg
-} from '@jdeighan/base-utils/debug';
-
-import {
-  undef,
-  defined,
-  notdefined,
-  OL,
-  isString,
-  isNonEmptyString,
-  isArray,
-  isHash,
-  isArrayOfStrings,
-  isEmpty,
-  nonEmpty
-} from '@jdeighan/coffee-utils';
-
-enableMapSet();
-
-// ---------------------------------------------------------------------------
-export var LOGMAP = function(label, map) {
-  var key, lLines, ref, value, x;
-  lLines = [`MAP ${label}:`];
-  ref = map.entries();
-  for (x of ref) {
-    [key, value] = x;
-    lLines.push(`   ${OL(key)}: ${OL(value)}`);
-  }
-  LOG(lLines.join("\n"));
-  LOG();
-};
-
-// ---------------------------------------------------------------------------
-export var addGift = produce(function(draft, giftName, hData = {}) {
-  var hValue;
-  assert(draft instanceof Map, "draft is not a Map");
-  if (draft.get(giftName)) {
-    throw new Error(`Gift ${giftName} already exists`);
-  }
-  hValue = {...hData};
-  hValue.name = giftName;
-  draft.set(giftName, hValue);
-});
-
-// ---------------------------------------------------------------------------
-export var reserveGift = produce(function(draft, giftName, user) {
-  var gift;
-  assert(draft instanceof Map, "draft is not a Map");
-  gift = draft.get(giftName);
-  assert(gift != null, `No such gift: ${giftName}`);
-  gift.reservedBy = user;
-});
-
-// ---------------------------------------------------------------------------
-export var cancelReservation = produce(function(draft, giftName) {
-  var gift;
-  assert(draft instanceof Map, "draft is not a Map");
-  gift = draft.get(giftName);
-  assert(defined(gift), `No such gift: ${giftName}`);
-  delete gift.reservedBy;
-});
-
-// ---------------------------------------------------------------------------

package/src/taml.coffee

@@ -1,16 +0,0 @@
-# taml.coffee
-
-import yaml from 'js-yaml'
-
-import {assert, croak, isTAML, fromTAML, toTAML} from '@jdeighan/base-utils'
-import {
-	undef, defined, notdefined, OL, chomp, escapeStr,
-	isString, isObject, isEmpty,
-	} from '@jdeighan/coffee-utils'
-import {splitLine} from '@jdeighan/coffee-utils/indent'
-import {
-	firstLine, toArray, toBlock,
-	} from '@jdeighan/coffee-utils/block'
-import {slurpTAML} from '@jdeighan/coffee-utils/fs'
-
-export {isTAML, fromTAML, toTAML, slurpTAML}

package/src/taml.js

@@ -1,44 +0,0 @@
-// Generated by CoffeeScript 2.7.0
-// taml.coffee
-import yaml from 'js-yaml';
-
-import {
-  assert,
-  croak,
-  isTAML,
-  fromTAML,
-  toTAML
-} from '@jdeighan/base-utils';
-
-import {
-  undef,
-  defined,
-  notdefined,
-  OL,
-  chomp,
-  escapeStr,
-  isString,
-  isObject,
-  isEmpty
-} from '@jdeighan/coffee-utils';
-
-import {
-  splitLine
-} from '@jdeighan/coffee-utils/indent';
-
-import {
-  firstLine,
-  toArray,
-  toBlock
-} from '@jdeighan/coffee-utils/block';
-
-import {
-  slurpTAML
-} from '@jdeighan/coffee-utils/fs';
-
-export {
-  isTAML,
-  fromTAML,
-  toTAML,
-  slurpTAML
-};