@tremolo-ui/functions 0.0.9 → 0.0.10

package/dist/esm/types/components/NumberInput/type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../../../src/components/NumberInput/type.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH;;;;GAIG;AACH,MAAM,MAAM,KAAK,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;AAEtC,wBAAgB,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAQxE;AAED,wBAAgB,UAAU,CACxB,WAAW,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,MAAM,GAAG,KAAK,EACtB,KAAK,CAAC,EAAE,MAAM,EACd,YAAY,SAAI;;;;EA6CjB;AAID,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,KAAK,UAShE"}
+{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../../../src/components/NumberInput/type.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;;;GAIG;AACH,MAAM,MAAM,KAAK,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;AAEtC,wBAAgB,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAMxE;AAED,wBAAgB,UAAU,CACxB,WAAW,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,MAAM,GAAG,KAAK,EACtB,KAAK,CAAC,EAAE,MAAM,GACb;IACD,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,MAAM,CAAA;CACb,CAkCA"}

package/dist/esm/types/index.d.ts

@@ -1,4 +1,9 @@
 /**
+ * This is how you import top-level functions.
+ *
+ * ```ts
+ * import { anyFunc } from '@tremolo-ui/functions'
+ * ```
  * @module top-level
  */
 export * from './math';

package/dist/esm/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,cAAc,QAAQ,CAAA;AACtB,cAAc,QAAQ,CAAA;AACtB,cAAc,SAAS,CAAA;AACvB,cAAc,QAAQ,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,cAAc,QAAQ,CAAA;AACtB,cAAc,QAAQ,CAAA;AACtB,cAAc,SAAS,CAAA;AACvB,cAAc,QAAQ,CAAA"}

package/dist/esm/types/math.d.ts

@@ -48,6 +48,11 @@ export declare function radian(degree: number): number;
  * @category Math
  */
 export declare function degree(radian: number): number;
+/**
+ *
+ * @category Math
+ */
+export declare function mapValue(value: number, inMin: number, inMax: number, outMin: number, outMax: number): number;
 /**
  *
  * @category Math

package/dist/esm/types/math.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"math.d.ts","sourceRoot":"","sources":["../../../src/math.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,UAE5D;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,EACX,IAAI,SAAI,UAKT;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CACtB,eAAe,EAAE,MAAM,EACvB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,EACX,IAAI,SAAI,UAQT;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,UAKZ;AAED;;;GAGG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,UAOpD;AAED;;;GAGG;AACH,wBAAgB,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,UAEzD;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAKlE;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAElE;AAED;;;GAGG;AACH,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,UAEpC;AAED;;;GAGG;AACH,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,UAEpC;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,EAAE,EAAE,MAAM,UAElC;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,UAEpC"}
+{"version":3,"file":"math.d.ts","sourceRoot":"","sources":["../../../src/math.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,UAE5D;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,EACX,IAAI,SAAI,UAKT;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CACtB,eAAe,EAAE,MAAM,EACvB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,EACX,IAAI,SAAI,UAQT;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,UAKZ;AAED;;;GAGG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,UAOpD;AAED;;;GAGG;AACH,wBAAgB,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,UAEzD;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAKlE;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAElE;AAED;;;GAGG;AACH,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,UAEpC;AAED;;;GAGG;AACH,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,UAEpC;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CACtB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,UAGf;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,EAAE,EAAE,MAAM,UAElC;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,UAEpC"}

package/dist/esm/types/midi.d.ts

@@ -23,22 +23,35 @@ export declare function parseNoteName(noteName: string): {
     octave: number;
 };
 /**
- *
+ * Convert noteName to noteNumber
  * @category MIDI
  */
 export declare function noteNumber(noteName: string): number;
 /**
- *
+ * Convert noteNumber to noteName
  * @category MIDI
  */
 export declare function noteName(noteNumber: number): string;
 /**
+ * @param note noteNumber: 0 ~ 127 or noteName e.g. 'C3'
  * @category MIDI
  */
 export declare function isWhiteKey(note: number | string): boolean;
+/**
+ * @param note noteNumber: 0 ~ 127 or noteName e.g. 'C3'
+ * @category MIDI
+ */
+export declare function isBlackKey(note: number | string): boolean;
 /**
  * @category MIDI
  */
-export declare function isBlackKey(noteNumber: number | string): boolean;
 export declare const scaleNames: string[];
+/**
+ * @param note noteNumber: 0 ~ 127 or noteName e.g. 'C3'
+ * @param detune [cent]
+ * @param a4 A4 frequency [Hz]
+ * @returns frequency [Hz]
+ * @category MIDI
+ */
+export declare function noteToFrequency(note: number | string, detune?: number, a4?: number): number;
 //# sourceMappingURL=midi.d.ts.map

package/dist/esm/types/midi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"midi.d.ts","sourceRoot":"","sources":["../../../src/midi.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,eAAO,MAAM,SAAS,8CAA+C,CAAA;AAErE;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,CAAC,CAAA;AAEjD;;GAEG;AACH,eAAO,MAAM,SAAS,4EAaZ,CAAA;AAEV;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,CAAC,CAAA;AAEjD;;GAEG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM;YAKJ,QAAQ;gBACpB,GAAG,GAAG,IAAI,GAAG,GAAG,GAAG,IAAI,GAAG,EAAE;;EAGzD;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,UAK1C;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,UAAU,EAAE,MAAM,UAI1C;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,WAW/C;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,WAErD;AAED,eAAO,MAAM,UAAU,UAAoD,CAAA"}
+{"version":3,"file":"midi.d.ts","sourceRoot":"","sources":["../../../src/midi.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,eAAO,MAAM,SAAS,8CAA+C,CAAA;AAErE;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,CAAC,CAAA;AAEjD;;GAEG;AACH,eAAO,MAAM,SAAS,4EAaZ,CAAA;AAEV;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,CAAC,CAAA;AAEjD;;GAEG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM;YAKJ,QAAQ;gBACpB,GAAG,GAAG,IAAI,GAAG,GAAG,GAAG,IAAI,GAAG,EAAE;;EAGzD;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,UAK1C;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,UAAU,EAAE,MAAM,UAI1C;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,WAW/C;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,WAE/C;AAED;;GAEG;AACH,eAAO,MAAM,UAAU,UAAoD,CAAA;AAE3E;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,MAAM,SAAI,EAAE,EAAE,SAAM,UAG1E"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tremolo-ui/functions",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "functions used in @tremolo-ui/react",
   "type": "module",
   "scripts": {

package/src/components/NumberInput/type.ts

@@ -2,8 +2,6 @@
  * @module NumberInput
  */
 
-import { toFixed } from '../../math'
-
 /**
  * [unit, scale][]
  * @example
@@ -12,8 +10,6 @@ import { toFixed } from '../../math'
 export type Units = [string, number][]
 
 export function selectUnit(units: Units, value: number): [string, number] {
-  if (typeof units == 'string') return [units, 1]
-
   let i = 0
   for (; i < units.length; i++) {
     if (Math.abs(units[i][1]) > Math.abs(value)) break
@@ -25,45 +21,38 @@ export function parseValue(
   inputString: string,
   units?: string | Units,
   digit?: number,
-  defaultValue = 0,
-) {
-  let str = inputString.trim()
-  if (str == '') str = String(defaultValue)
-  if (!units) {
-    return {
-      rawValue: Number(str) || defaultValue,
-      formatValue: str,
-      unit: '',
-    }
-  } else if (typeof units == 'string') {
+): {
+  rawValue: number
+  formatValue: string
+  unit: string
+} {
+  const str = inputString.trim()
+  if (!units || typeof units == 'string') {
+    const m = str.match(/-?\d+(\.\d+)?/)
+    let v = Number(m?.[0] ?? '0')
+    v = isNaN(v) ? 0 : v
     return {
-      rawValue: Number(str) || defaultValue,
-      formatValue: `${str}${units}`,
-      unit: units,
+      rawValue: v,
+      formatValue: (digit != undefined ? v.toFixed(digit) : v) + (units ?? ''),
+      unit: units ?? '',
     }
   }
 
   const unitList = units.map(([u, _s]) => u)
   const scaleList = units.map(([_u, s]) => s)
-  let rawValue = defaultValue
-  let formatValue = `${scaleList[0]}`
+  let rawValue = 0
   let unit = unitList[0]
+  let formatValue =
+    (digit != undefined ? rawValue.toFixed(digit) : rawValue) + unit
   const m = str.match(/^(-?\d+(\.\d+)?)\s*(\w*)$/)
   if (m) {
     rawValue = Number(m[1]) || 0
-    const inputUnit = m[3]
-    if (inputUnit != '' && unitList.indexOf(inputUnit) != -1) {
-      rawValue *= scaleList[unitList.indexOf(inputUnit)]
-      const s = selectUnit(units, rawValue)
-      const v = rawValue / s[1]
-      formatValue = `${digit != undefined ? toFixed(v, digit) : v}${s[0]}`
-      unit = s[0]
-    } else {
-      const [u, scale] = selectUnit(units, rawValue)
-      const v = rawValue / scale
-      formatValue = `${digit != undefined ? toFixed(v, digit) : v}${u}`
-      unit = u
-    }
+    const uIndex = unitList.indexOf(m[3])
+    rawValue *= uIndex != -1 ? scaleList[uIndex] : 1
+    const [u, scale] = selectUnit(units, rawValue)
+    const v = rawValue / scale
+    formatValue = (digit != undefined ? v.toFixed(digit) : v) + u
+    unit = u
   }
   return {
     rawValue: rawValue,
@@ -71,16 +60,3 @@ export function parseValue(
     unit: unit,
   }
 }
-
-// TODO: toFixed 以外のフォーマット手法
-// e.g. 小数点第n位
-export function formatValue(value: number, units?: string | Units) {
-  if (!units) {
-    return `${value}`
-  } else if (typeof units == 'string') {
-    return `${value}${units}`
-  } else {
-    const [unit, scale] = selectUnit(units, value)
-    return `${toFixed(value / scale)}${unit}`
-  }
-}

package/src/index.ts

@@ -1,4 +1,9 @@
 /**
+ * This is how you import top-level functions.
+ *
+ * ```ts
+ * import { anyFunc } from '@tremolo-ui/functions'
+ * ```
  * @module top-level
  */
 

package/src/math.ts

@@ -109,6 +109,20 @@ export function degree(radian: number) {
   return (180 * radian) / Math.PI
 }
 
+/**
+ *
+ * @category Math
+ */
+export function mapValue(
+  value: number,
+  inMin: number,
+  inMax: number,
+  outMin: number,
+  outMax: number,
+) {
+  return ((value - inMin) / (inMax - inMin)) * (outMax - outMin) + outMin
+}
+
 /**
  *
  * @category Math

package/src/midi.ts

@@ -48,7 +48,7 @@ export function parseNoteName(noteName: string) {
 }
 
 /**
- *
+ * Convert noteName to noteNumber
  * @category MIDI
  */
 export function noteNumber(noteName: string) {
@@ -59,7 +59,7 @@ export function noteNumber(noteName: string) {
 }
 
 /**
- *
+ * Convert noteNumber to noteName
  * @category MIDI
  */
 export function noteName(noteNumber: number) {
@@ -69,6 +69,7 @@ export function noteName(noteNumber: number) {
 }
 
 /**
+ * @param note noteNumber: 0 ~ 127 or noteName e.g. 'C3'
  * @category MIDI
  */
 export function isWhiteKey(note: number | string) {
@@ -85,10 +86,26 @@ export function isWhiteKey(note: number | string) {
 }
 
 /**
+ * @param note noteNumber: 0 ~ 127 or noteName e.g. 'C3'
  * @category MIDI
  */
-export function isBlackKey(noteNumber: number | string) {
-  return !isWhiteKey(noteNumber)
+export function isBlackKey(note: number | string) {
+  return !isWhiteKey(note)
 }
 
+/**
+ * @category MIDI
+ */
 export const scaleNames = ['major', 'minor', 'natural minor', 'pentatonic']
+
+/**
+ * @param note noteNumber: 0 ~ 127 or noteName e.g. 'C3'
+ * @param detune [cent]
+ * @param a4 A4 frequency [Hz]
+ * @returns frequency [Hz]
+ * @category MIDI
+ */
+export function noteToFrequency(note: number | string, detune = 0, a4 = 440) {
+  const n = typeof note == 'string' ? noteNumber(note) : note
+  return (a4 / 32) * 2 ** ((n - 9 + detune / 100) / 12)
+}