Skip to content

Commit

Permalink
scribe-npm-publish-fix (#89)
Browse files Browse the repository at this point in the history
  • Loading branch information
samueljd committed May 14, 2024
2 parents acca53d + 93716d6 commit 8d83f7b
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 43 deletions.
Empty file modified .husky/pre-commit
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion packages/scribe/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "scribe-editor",
"name": "@biblionexus-foundation/scribe-editor",
"version": "0.0.1",
"description": "Scripture editor used in Scribe",
"license": "MIT",
Expand Down
1 change: 0 additions & 1 deletion packages/scribe/prettier.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
const config = {
trailingComma: "es5",
plugins: ["prettier-plugin-tailwindcss"],
};

Expand Down
26 changes: 13 additions & 13 deletions packages/scribe/src/adaptors/editor-usj.adaptor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,13 @@ export function deserializeEditorState(editorState: EditorState): Usj | undefine

function removeUndefinedProperties<T>(obj: T): T {
return Object.fromEntries(
Object.entries(obj as Partial<T>).filter(([, value]) => value !== undefined)
Object.entries(obj as Partial<T>).filter(([, value]) => value !== undefined),
) as T;
}

function createBookMarker(
node: SerializedBookNode,
content: MarkerContent[] | undefined
content: MarkerContent[] | undefined,
): MarkerObject {
const { type, marker, code, unknownAttributes } = node;
return removeUndefinedProperties({
Expand All @@ -108,7 +108,7 @@ function parseNumberFromText(marker: string, text: string | undefined, number: s
}

function createChapterMarker(
node: SerializedImmutableChapterNode | SerializedChapterNode
node: SerializedImmutableChapterNode | SerializedChapterNode,
): MarkerObject {
const { marker, sid, altnumber, pubnumber, unknownAttributes } = node;
const { text } = node as SerializedChapterNode;
Expand Down Expand Up @@ -155,7 +155,7 @@ function createCharMarker(node: SerializedCharNode): MarkerObject {

function createParaMarker(
node: SerializedParaNode,
content: MarkerContent[] | undefined
content: MarkerContent[] | undefined,
): MarkerObject {
const { type, marker, unknownAttributes } = node;
return removeUndefinedProperties({
Expand All @@ -168,7 +168,7 @@ function createParaMarker(

function createNoteMarker(
node: SerializedNoteNode,
content: MarkerContent[] | undefined
content: MarkerContent[] | undefined,
): MarkerObject {
const { type, marker, caller, category, unknownAttributes } = node;
return removeUndefinedProperties({
Expand Down Expand Up @@ -198,7 +198,7 @@ function createTextMarker(node: SerializedTextNode): string {

function createUnknownMarker(
node: SerializedUnknownNode,
content: MarkerContent[] | undefined
content: MarkerContent[] | undefined,
): MarkerObject {
const { tag, marker, unknownAttributes } = node;
return removeUndefinedProperties({
Expand All @@ -211,7 +211,7 @@ function createUnknownMarker(

function recurseNodes(
nodes: SerializedLexicalNode[],
noteCaller?: string
noteCaller?: string,
): MarkerContent[] | undefined {
const markers: MarkerContent[] = [];
nodes.forEach((node) => {
Expand All @@ -223,13 +223,13 @@ function recurseNodes(
switch (node.type) {
case BookNode.getType():
markers.push(
createBookMarker(serializedBookNode, recurseNodes(serializedBookNode.children))
createBookMarker(serializedBookNode, recurseNodes(serializedBookNode.children)),
);
break;
case ImmutableChapterNode.getType():
case ChapterNode.getType():
markers.push(
createChapterMarker(node as SerializedImmutableChapterNode | SerializedChapterNode)
createChapterMarker(node as SerializedImmutableChapterNode | SerializedChapterNode),
);
break;
case ImmutableVerseNode.getType():
Expand All @@ -241,15 +241,15 @@ function recurseNodes(
break;
case ParaNode.getType():
markers.push(
createParaMarker(serializedParaNode, recurseNodes(serializedParaNode.children))
createParaMarker(serializedParaNode, recurseNodes(serializedParaNode.children)),
);
break;
case NoteNode.getType():
markers.push(
createNoteMarker(
serializedNoteNode,
recurseNodes(serializedNoteNode.children, serializedNoteNode.caller)
)
recurseNodes(serializedNoteNode.children, serializedNoteNode.caller),
),
);
break;
case ImmutableNoteCallerNode.getType():
Expand All @@ -271,7 +271,7 @@ function recurseNodes(
break;
case UnknownNode.getType():
markers.push(
createUnknownMarker(serializedUnknownNode, recurseNodes(serializedUnknownNode.children))
createUnknownMarker(serializedUnknownNode, recurseNodes(serializedUnknownNode.children)),
);
break;
default:
Expand Down
24 changes: 12 additions & 12 deletions packages/scribe/src/adaptors/note-usj-editor.adaptor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ let _logger: LoggerBasic;

export function initialize(
nodeOptions: UsjNodeOptions | undefined,
logger: LoggerBasic | undefined
logger: LoggerBasic | undefined,
) {
setNodeOptions(nodeOptions);
setLogger(logger);
Expand All @@ -179,7 +179,7 @@ function getNotesFromUsj(usjContent: MarkerContent[]) {

export function serializeEditorState(
usj: Usj | undefined,
viewOptions?: ViewOptions
viewOptions?: ViewOptions,
): SerializedEditorState {
if (viewOptions) _viewOptions = viewOptions;
// use default view mode
Expand All @@ -195,7 +195,7 @@ export function serializeEditorState(
_logger?.warn(`This USJ type '${usj.type}' didn't match the expected type '${USJ_TYPE}'.`);
if (usj.version !== USJ_VERSION)
_logger?.warn(
`This USJ version '${usj.version}' didn't match the expected version '${USJ_VERSION}'.`
`This USJ version '${usj.version}' didn't match the expected version '${USJ_VERSION}'.`,
);

const notes = getNotesFromUsj(usj.content);
Expand Down Expand Up @@ -336,7 +336,7 @@ function createBook(markerObject: MarkerObject): SerializedBookNode {
}

function createChapter(
markerObject: MarkerObject
markerObject: MarkerObject,
): SerializedChapterNode | SerializedImmutableChapterNode {
const { marker, number, sid, altnumber, pubnumber } = markerObject;
if (marker !== CHAPTER_MARKER) {
Expand Down Expand Up @@ -369,7 +369,7 @@ function createChapter(
}

function createVerse(
markerObject: MarkerObject
markerObject: MarkerObject,
): SerializedVerseNode | SerializedImmutableVerseNode {
const { marker, number, sid, altnumber, pubnumber } = markerObject;
if (marker !== VERSE_MARKER) {
Expand Down Expand Up @@ -435,7 +435,7 @@ function createImpliedPara(children: SerializedLexicalNode[]): SerializedImplied

function createPara(
markerObject: MarkerObject,
childNodes: SerializedLexicalNode[] = []
childNodes: SerializedLexicalNode[] = [],
): SerializedParaNode {
const { marker } = markerObject;
if (!ParaNode.isValidMarker(marker)) {
Expand Down Expand Up @@ -464,7 +464,7 @@ function createPara(

function createNoteCaller(
caller: string,
childNodes: SerializedLexicalNode[]
childNodes: SerializedLexicalNode[],
): SerializedImmutableNoteCallerNode {
const previewText = getPreviewTextFromSerializedNodes(childNodes);
let onClick: OnClick = () => undefined;
Expand All @@ -482,7 +482,7 @@ function createNoteCaller(

function createNote(
markerObject: MarkerObject,
childNodes: SerializedLexicalNode[]
childNodes: SerializedLexicalNode[],
): SerializedNoteNode {
const { marker, category } = markerObject;
if (!NoteNode.isValidMarker(marker)) {
Expand Down Expand Up @@ -555,7 +555,7 @@ function createMark(children: SerializedLexicalNode[], ids: string[] = []): Seri

function createUnknown(
markerObject: MarkerObject,
childNodes: SerializedLexicalNode[]
childNodes: SerializedLexicalNode[],
): SerializedUnknownNode {
const { marker } = markerObject;
const tag = markerObject.type;
Expand Down Expand Up @@ -642,7 +642,7 @@ function insertMilestoneMarksRecurse(
nodes: SerializedLexicalNode[],
msMarkIndexes: number[],
isPreviousMsStarting = false,
sids: string[] = []
sids: string[] = [],
): SerializedLexicalNode[] {
if (msMarkIndexes.length <= 0 || msMarkIndexes[0] >= nodes.length) return nodes;

Expand All @@ -658,7 +658,7 @@ function insertMilestoneMarksRecurse(
nodes.slice(firstIndex + 1, secondIndex),
reIndex(msMarkIndexes, firstIndex + 1),
firstMSMarkNode.marker === STARTING_MS_MARK_MARKER,
sids
sids,
);
const markNode = createMark(markedNodes, [...sids]);
const secondMSMarkNode = nodes[secondIndex] as SerializedMilestoneNode;
Expand All @@ -667,7 +667,7 @@ function insertMilestoneMarksRecurse(
nodes.slice(secondIndex + 1),
reIndex(msMarkIndexes, secondIndex + 1),
secondMSMarkNode.marker === STARTING_MS_MARK_MARKER,
sids
sids,
);
return [...nodesBefore, firstMSMarkNode, markNode, secondMSMarkNode, ...nodesAfter];
}
Expand Down
24 changes: 12 additions & 12 deletions packages/scribe/src/adaptors/usj-editor.adaptor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ let _logger: LoggerBasic;

export function initialize(
nodeOptions: UsjNodeOptions | undefined,
logger: LoggerBasic | undefined
logger: LoggerBasic | undefined,
) {
setNodeOptions(nodeOptions);
setLogger(logger);
Expand All @@ -165,7 +165,7 @@ export function reset(callerCountValue = 0) {

export function serializeEditorState(
usj: Usj | undefined,
viewOptions?: ViewOptions
viewOptions?: ViewOptions,
): SerializedEditorState {
if (viewOptions) _viewOptions = viewOptions;
// use default view mode
Expand All @@ -181,7 +181,7 @@ export function serializeEditorState(
_logger?.warn(`This USJ type '${usj.type}' didn't match the expected type '${USJ_TYPE}'.`);
if (usj.version !== USJ_VERSION)
_logger?.warn(
`This USJ version '${usj.version}' didn't match the expected version '${USJ_VERSION}'.`
`This USJ version '${usj.version}' didn't match the expected version '${USJ_VERSION}'.`,
);

if (usj.content.length > 0) children = insertImpliedParasRecurse(recurseNodes(usj.content));
Expand Down Expand Up @@ -321,7 +321,7 @@ function createBook(markerObject: MarkerObject): SerializedBookNode {
}

function createChapter(
markerObject: MarkerObject
markerObject: MarkerObject,
): SerializedChapterNode | SerializedImmutableChapterNode {
const { marker, number, sid, altnumber, pubnumber } = markerObject;
if (marker !== CHAPTER_MARKER) {
Expand Down Expand Up @@ -354,7 +354,7 @@ function createChapter(
}

function createVerse(
markerObject: MarkerObject
markerObject: MarkerObject,
): SerializedVerseNode | SerializedImmutableVerseNode {
const { marker, number, sid, altnumber, pubnumber } = markerObject;
if (marker !== VERSE_MARKER) {
Expand Down Expand Up @@ -420,7 +420,7 @@ function createImpliedPara(children: SerializedLexicalNode[]): SerializedImplied

function createPara(
markerObject: MarkerObject,
childNodes: SerializedLexicalNode[] = []
childNodes: SerializedLexicalNode[] = [],
): SerializedParaNode {
const { marker } = markerObject;
if (!ParaNode.isValidMarker(marker)) {
Expand Down Expand Up @@ -449,7 +449,7 @@ function createPara(

function createNoteCaller(
caller: string,
childNodes: SerializedLexicalNode[]
childNodes: SerializedLexicalNode[],
): SerializedImmutableNoteCallerNode {
const previewText = getPreviewTextFromSerializedNodes(childNodes);
let onClick: OnClick = () => undefined;
Expand All @@ -467,7 +467,7 @@ function createNoteCaller(

function createNote(
markerObject: MarkerObject,
childNodes: SerializedLexicalNode[]
childNodes: SerializedLexicalNode[],
): SerializedNoteNode {
const { marker, category } = markerObject;
if (!NoteNode.isValidMarker(marker)) {
Expand Down Expand Up @@ -540,7 +540,7 @@ function createMark(children: SerializedLexicalNode[], ids: string[] = []): Seri

function createUnknown(
markerObject: MarkerObject,
childNodes: SerializedLexicalNode[]
childNodes: SerializedLexicalNode[],
): SerializedUnknownNode {
const { marker } = markerObject;
const tag = markerObject.type;
Expand Down Expand Up @@ -627,7 +627,7 @@ function insertMilestoneMarksRecurse(
nodes: SerializedLexicalNode[],
msMarkIndexes: number[],
isPreviousMsStarting = false,
sids: string[] = []
sids: string[] = [],
): SerializedLexicalNode[] {
if (msMarkIndexes.length <= 0 || msMarkIndexes[0] >= nodes.length) return nodes;

Expand All @@ -643,7 +643,7 @@ function insertMilestoneMarksRecurse(
nodes.slice(firstIndex + 1, secondIndex),
reIndex(msMarkIndexes, firstIndex + 1),
firstMSMarkNode.marker === STARTING_MS_MARK_MARKER,
sids
sids,
);
const markNode = createMark(markedNodes, [...sids]);
const secondMSMarkNode = nodes[secondIndex] as SerializedMilestoneNode;
Expand All @@ -652,7 +652,7 @@ function insertMilestoneMarksRecurse(
nodes.slice(secondIndex + 1),
reIndex(msMarkIndexes, secondIndex + 1),
secondMSMarkNode.marker === STARTING_MS_MARK_MARKER,
sids
sids,
);
return [...nodesBefore, firstMSMarkNode, markNode, secondMSMarkNode, ...nodesAfter];
}
Expand Down
4 changes: 2 additions & 2 deletions packages/scribe/src/components/Editor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ type EditorProps = {

const Editor = forwardRef(function Editor(
{ usjInput, onChange, viewOptions, nodeOptions }: EditorProps,
ref: React.ForwardedRef<EditorRef>
ref: React.ForwardedRef<EditorRef>,
): JSX.Element {
const editorRef = useRef<LexicalEditor>(null);
const [usj, setUsj] = useState(usjInput);
Expand Down Expand Up @@ -89,7 +89,7 @@ const Editor = forwardRef(function Editor(
setEditedUsj(usj);
}
},
[onChange, setEditedUsj]
[onChange, setEditedUsj],
);

return (
Expand Down
2 changes: 1 addition & 1 deletion packages/scribe/src/components/NoteEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export const NoteEditor = ({
onChange(usj);
}
},
[onChange]
[onChange],
);
useEffect(() => {
const noteEditor = document.getElementById("noteEditor");
Expand Down
2 changes: 1 addition & 1 deletion packages/scribe/src/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ import "./index.css";
ReactDOM.createRoot(document.getElementById("root")!).render(
<React.StrictMode>
<App />
</React.StrictMode>
</React.StrictMode>,
);

0 comments on commit 8d83f7b

Please sign in to comment.