@jdeighan/coffee-utils 13.0.11 → 13.0.13

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "13.0.11",
+	"version": "13.0.13",
 	"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,114 +4,46 @@ 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'
 
 # ---------------------------------------------------------------------------
 
-export class WritableDataStore
-
-	constructor: (value=undef) ->
-		@store = writable value
-
-	subscribe: (func) ->
-		return @store.subscribe(func)
-
-	set: (value) ->
-		@store.set(value)
-
-	update: (func) ->
-		@store.update(func)
+export class StaticDataStore
 
-# ---------------------------------------------------------------------------
-
-export class BaseDataStore
+	constructor: (value) ->
+		@value = value
 
-	constructor: (@value=undef) ->
-		@lSubscribers = []
-
-	subscribe: (func) ->
-		func @value
-		@lSubscribers.push func
+	subscribe: (cbFunc) ->
+		cbFunc @value
 		return () ->
-			pos = @lSubscribers.indexOf func
-			@lSubscribers.splice pos, 1
+			pass()
 
 	set: (val) ->
-		@value = val
-		@alertSubscribers()
-		return
+		croak "Can't set() a StaticDataStore"
 
 	update: (func) ->
-		@value = func(@value)
-		@alertSubscribers()
-		return
-
-	alertSubscribers: () ->
-		for func in @lSubscribers
-			func @value
-		return
-
-# ---------------------------------------------------------------------------
-
-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
-			}
+		croak "Can't update() a StaticDataStore"
 
 # ---------------------------------------------------------------------------
 
-export class ToDoDataStore
-	# --- implemented with immer
+export class WritableDataStore
 
-	constructor: () ->
-		@lToDos = []
-		@lSubscribers = []
+	constructor: (value=undef) ->
+		@store = writable value
 
 	subscribe: (func) ->
-		func(@lToDos)
-		@lSubscribers.push func
-		return () ->
-			index = @lSubscribers.indexOf func
-			@lSubscribers.splice index, 1
-
-	alertSubscribers: () ->
-		for func in @lSubscribers
-			func(@lToDos)
-		return
+		return @store.subscribe(func)
 
 	set: (value) ->
-		# --- Set new value
-		@alertSubscribers()
+		@store.set(value)
 
 	update: (func) ->
-		# --- Update value
-		@alertSubscribers()
-
-	add: (name) ->
-		@lToDos.push {
-			text: name
-			done: false
-			}
-		return
+		@store.update(func)
 
 # ---------------------------------------------------------------------------
 
@@ -209,6 +141,79 @@ export class TAMLDataStore extends WritableDataStore
 
 		super fromTAML(str)
 
+# ---------------------------------------------------------------------------
+# --- Mainly for better understanding, I've implemented data stores
+#     without using svelte's readable or writable data stores
+
+export class BaseDataStore
+
+	constructor: (@value=undef) ->
+		@lSubscribers = []
+
+	subscribe: (cbFunc) ->
+		cbFunc @value
+		@lSubscribers.push cbFunc
+		return () ->
+			index = @lSubscribers.indexOf cbFunc
+			@lSubscribers.splice index, 1
+
+	set: (val) ->
+		@value = val
+		return
+
+	update: (func) ->
+		@value = func(@value)
+		@alertSubscribers()
+		return
+
+	alertSubscribers: () ->
+		for cbFunc in @lSubscribers
+			cbFunc @value
+		return
+
+# ---------------------------------------------------------------------------
+
+export class ToDoDataStore extends BaseDataStore
+
+	constructor: () ->
+		lToDos = []   # save local reference to make code easier to grok
+		super lToDos
+		@lToDos = lToDos   # can't do this before calling super
+
+	set: (val) ->
+		croak "Don't use set()"
+
+	update: (func) ->
+		croak "Don't use update()"
+
+	find: (name) ->
+		# --- returns index
+		for index in range(@lToDos.length)
+			if (@lToDos[index].text == name)
+				return index
+		return undef
+
+	clear: () ->
+		# --- Don't set a new array. That would break our reference
+		@lToDos.splice 0, @lToDos.length
+		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
+		@alertSubscribers()
+		return
+
 # ---------------------------------------------------------------------------
 #         UTILITIES
 # ---------------------------------------------------------------------------

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,138 +34,45 @@ 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) {
-    this.store = writable(value);
+export var StaticDataStore = class StaticDataStore {
+  constructor(value) {
+    this.value = value;
   }
 
-  subscribe(func) {
-    return this.store.subscribe(func);
-  }
-
-  set(value) {
-    return this.store.set(value);
-  }
-
-  update(func) {
-    return this.store.update(func);
-  }
-
-};
-
-// ---------------------------------------------------------------------------
-export var BaseDataStore = class BaseDataStore {
-  constructor(value1 = undef) {
-    this.value = value1;
-    this.lSubscribers = [];
-  }
-
-  subscribe(func) {
-    func(this.value);
-    this.lSubscribers.push(func);
+  subscribe(cbFunc) {
+    cbFunc(this.value);
     return function() {
-      var pos;
-      pos = this.lSubscribers.indexOf(func);
-      return this.lSubscribers.splice(pos, 1);
+      return pass();
     };
   }
 
   set(val) {
-    this.value = val;
-    this.alertSubscribers();
+    return croak("Can't set() a StaticDataStore");
   }
 
   update(func) {
-    this.value = func(this.value);
-    this.alertSubscribers();
-  }
-
-  alertSubscribers() {
-    var func, i, len, ref;
-    ref = this.lSubscribers;
-    for (i = 0, len = ref.length; i < len; i++) {
-      func = ref[i];
-      func(this.value);
-    }
+    return croak("Can't update() a StaticDataStore");
   }
 
 };
 
 // ---------------------------------------------------------------------------
-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
-  constructor() {
-    this.lToDos = [];
-    this.lSubscribers = [];
+export var WritableDataStore = class WritableDataStore {
+  constructor(value = undef) {
+    this.store = writable(value);
   }
 
   subscribe(func) {
-    func(this.lToDos);
-    this.lSubscribers.push(func);
-    return function() {
-      var index;
-      index = this.lSubscribers.indexOf(func);
-      return this.lSubscribers.splice(index, 1);
-    };
-  }
-
-  alertSubscribers() {
-    var func, i, len, ref;
-    ref = this.lSubscribers;
-    for (i = 0, len = ref.length; i < len; i++) {
-      func = ref[i];
-      func(this.lToDos);
-    }
+    return this.store.subscribe(func);
   }
 
   set(value) {
-    // --- Set new value
-    return this.alertSubscribers();
+    return this.store.set(value);
   }
 
   update(func) {
-    // --- Update value
-    return this.alertSubscribers();
-  }
-
-  add(name) {
-    this.lToDos.push({
-      text: name,
-      done: false
-    });
+    return this.store.update(func);
   }
 
 };
@@ -280,6 +192,100 @@ export var TAMLDataStore = class TAMLDataStore extends WritableDataStore {
 
 };
 
+// ---------------------------------------------------------------------------
+// --- Mainly for better understanding, I've implemented data stores
+//     without using svelte's readable or writable data stores
+export var BaseDataStore = class BaseDataStore {
+  constructor(value1 = undef) {
+    this.value = value1;
+    this.lSubscribers = [];
+  }
+
+  subscribe(cbFunc) {
+    cbFunc(this.value);
+    this.lSubscribers.push(cbFunc);
+    return function() {
+      var index;
+      index = this.lSubscribers.indexOf(cbFunc);
+      return this.lSubscribers.splice(index, 1);
+    };
+  }
+
+  set(val) {
+    this.value = val;
+  }
+
+  update(func) {
+    this.value = func(this.value);
+    this.alertSubscribers();
+  }
+
+  alertSubscribers() {
+    var cbFunc, i, len, ref;
+    ref = this.lSubscribers;
+    for (i = 0, len = ref.length; i < len; i++) {
+      cbFunc = ref[i];
+      cbFunc(this.value);
+    }
+  }
+
+};
+
+// ---------------------------------------------------------------------------
+export var ToDoDataStore = class ToDoDataStore extends BaseDataStore {
+  constructor() {
+    var lToDos;
+    lToDos = []; // save local reference to make code easier to grok
+    super(lToDos);
+    this.lToDos = lToDos; // can't do this before calling super
+  }
+
+  set(val) {
+    return croak("Don't use set()");
+  }
+
+  update(func) {
+    return croak("Don't use update()");
+  }
+
+  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;
+  }
+
+  clear() {
+    // --- Don't set a new array. That would break our reference
+    this.lToDos.splice(0, this.lToDos.length);
+  }
+
+  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);
+    this.alertSubscribers();
+  }
+
+};
+
 // ---------------------------------------------------------------------------
 //         UTILITIES
 // ---------------------------------------------------------------------------

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
-};